Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
ab88b25f
F
Ffmpeg
项目概览
小白菜888
/
Ffmpeg
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
Ffmpeg
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
ab88b25f
编写于
10月 17, 2011
作者:
A
Anton Khirnov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
lavf: use avpriv_ prefix for some dv functions.
They are used in libavdevice.
上级
1fa395e4
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
18 addition
and
18 deletion
+18
-18
libavdevice/dv1394.c
libavdevice/dv1394.c
+3
-3
libavformat/avidec.c
libavformat/avidec.c
+3
-3
libavformat/dv.c
libavformat/dv.c
+6
-6
libavformat/dv.h
libavformat/dv.h
+3
-3
libavformat/mov.c
libavformat/mov.c
+3
-3
未找到文件。
libavdevice/dv1394.c
浏览文件 @
ab88b25f
...
...
@@ -86,7 +86,7 @@ static int dv1394_read_header(AVFormatContext * context, AVFormatParameters * ap
{
struct
dv1394_data
*
dv
=
context
->
priv_data
;
dv
->
dv_demux
=
dv_init_demux
(
context
);
dv
->
dv_demux
=
avpriv_
dv_init_demux
(
context
);
if
(
!
dv
->
dv_demux
)
goto
failed
;
...
...
@@ -124,7 +124,7 @@ static int dv1394_read_packet(AVFormatContext *context, AVPacket *pkt)
struct
dv1394_data
*
dv
=
context
->
priv_data
;
int
size
;
size
=
dv_get_packet
(
dv
->
dv_demux
,
pkt
);
size
=
avpriv_
dv_get_packet
(
dv
->
dv_demux
,
pkt
);
if
(
size
>
0
)
return
size
;
...
...
@@ -186,7 +186,7 @@ restart_poll:
av_dlog
(
context
,
"index %d, avail %d, done %d
\n
"
,
dv
->
index
,
dv
->
avail
,
dv
->
done
);
size
=
dv_produce_packet
(
dv
->
dv_demux
,
pkt
,
size
=
avpriv_
dv_produce_packet
(
dv
->
dv_demux
,
pkt
,
dv
->
ring
+
(
dv
->
index
*
DV1394_PAL_FRAME_SIZE
),
DV1394_PAL_FRAME_SIZE
);
dv
->
index
=
(
dv
->
index
+
1
)
%
DV1394_RING_FRAMES
;
...
...
libavformat/avidec.c
浏览文件 @
ab88b25f
...
...
@@ -462,7 +462,7 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap)
av_freep
(
&
s
->
streams
[
0
]);
s
->
nb_streams
=
0
;
if
(
CONFIG_DV_DEMUXER
)
{
avi
->
dv_demux
=
dv_init_demux
(
s
);
avi
->
dv_demux
=
avpriv_
dv_init_demux
(
s
);
if
(
!
avi
->
dv_demux
)
goto
fail
;
}
...
...
@@ -979,7 +979,7 @@ static int avi_read_packet(AVFormatContext *s, AVPacket *pkt)
void
*
dstr
;
if
(
CONFIG_DV_DEMUXER
&&
avi
->
dv_demux
)
{
int
size
=
dv_get_packet
(
avi
->
dv_demux
,
pkt
);
int
size
=
avpriv_
dv_get_packet
(
avi
->
dv_demux
,
pkt
);
if
(
size
>=
0
)
return
size
;
}
...
...
@@ -1079,7 +1079,7 @@ resync:
if
(
CONFIG_DV_DEMUXER
&&
avi
->
dv_demux
)
{
dstr
=
pkt
->
destruct
;
size
=
dv_produce_packet
(
avi
->
dv_demux
,
pkt
,
size
=
avpriv_
dv_produce_packet
(
avi
->
dv_demux
,
pkt
,
pkt
->
data
,
pkt
->
size
);
pkt
->
destruct
=
dstr
;
pkt
->
flags
|=
AV_PKT_FLAG_KEY
;
...
...
libavformat/dv.c
浏览文件 @
ab88b25f
...
...
@@ -270,7 +270,7 @@ static int dv_extract_video_info(DVDemuxContext *c, uint8_t* frame)
* The following 3 functions constitute our interface to the world
*/
DVDemuxContext
*
dv_init_demux
(
AVFormatContext
*
s
)
DVDemuxContext
*
avpriv_
dv_init_demux
(
AVFormatContext
*
s
)
{
DVDemuxContext
*
c
;
...
...
@@ -299,7 +299,7 @@ DVDemuxContext* dv_init_demux(AVFormatContext *s)
return
c
;
}
int
dv_get_packet
(
DVDemuxContext
*
c
,
AVPacket
*
pkt
)
int
avpriv_
dv_get_packet
(
DVDemuxContext
*
c
,
AVPacket
*
pkt
)
{
int
size
=
-
1
;
int
i
;
...
...
@@ -316,7 +316,7 @@ int dv_get_packet(DVDemuxContext *c, AVPacket *pkt)
return
size
;
}
int
dv_produce_packet
(
DVDemuxContext
*
c
,
AVPacket
*
pkt
,
int
avpriv_
dv_produce_packet
(
DVDemuxContext
*
c
,
AVPacket
*
pkt
,
uint8_t
*
buf
,
int
buf_size
)
{
int
size
,
i
;
...
...
@@ -407,7 +407,7 @@ static int dv_read_header(AVFormatContext *s,
unsigned
state
,
marker_pos
=
0
;
RawDVContext
*
c
=
s
->
priv_data
;
c
->
dv_demux
=
dv_init_demux
(
s
);
c
->
dv_demux
=
avpriv_
dv_init_demux
(
s
);
if
(
!
c
->
dv_demux
)
return
-
1
;
...
...
@@ -450,7 +450,7 @@ static int dv_read_packet(AVFormatContext *s, AVPacket *pkt)
int
size
;
RawDVContext
*
c
=
s
->
priv_data
;
size
=
dv_get_packet
(
c
->
dv_demux
,
pkt
);
size
=
avpriv_
dv_get_packet
(
c
->
dv_demux
,
pkt
);
if
(
size
<
0
)
{
if
(
!
c
->
dv_demux
->
sys
)
...
...
@@ -459,7 +459,7 @@ static int dv_read_packet(AVFormatContext *s, AVPacket *pkt)
if
(
avio_read
(
s
->
pb
,
c
->
buf
,
size
)
<=
0
)
return
AVERROR
(
EIO
);
size
=
dv_produce_packet
(
c
->
dv_demux
,
pkt
,
c
->
buf
,
size
);
size
=
avpriv_
dv_produce_packet
(
c
->
dv_demux
,
pkt
,
c
->
buf
,
size
);
}
return
size
;
...
...
libavformat/dv.h
浏览文件 @
ab88b25f
...
...
@@ -31,9 +31,9 @@
#include "avformat.h"
typedef
struct
DVDemuxContext
DVDemuxContext
;
DVDemuxContext
*
dv_init_demux
(
AVFormatContext
*
s
);
int
dv_get_packet
(
DVDemuxContext
*
,
AVPacket
*
);
int
dv_produce_packet
(
DVDemuxContext
*
,
AVPacket
*
,
uint8_t
*
,
int
);
DVDemuxContext
*
avpriv_
dv_init_demux
(
AVFormatContext
*
s
);
int
avpriv_
dv_get_packet
(
DVDemuxContext
*
,
AVPacket
*
);
int
avpriv_
dv_produce_packet
(
DVDemuxContext
*
,
AVPacket
*
,
uint8_t
*
,
int
);
void
dv_offset_reset
(
DVDemuxContext
*
c
,
int64_t
frame_offset
);
typedef
struct
DVMuxContext
DVMuxContext
;
...
...
libavformat/mov.c
浏览文件 @
ab88b25f
...
...
@@ -1249,7 +1249,7 @@ int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries)
#if CONFIG_DV_DEMUXER
case
CODEC_ID_DVAUDIO
:
c
->
dv_fctx
=
avformat_alloc_context
();
c
->
dv_demux
=
dv_init_demux
(
c
->
dv_fctx
);
c
->
dv_demux
=
avpriv_
dv_init_demux
(
c
->
dv_fctx
);
if
(
!
c
->
dv_demux
)
{
av_log
(
c
->
fc
,
AV_LOG_ERROR
,
"dv demux context init error
\n
"
);
return
-
1
;
...
...
@@ -2528,10 +2528,10 @@ static int mov_read_packet(AVFormatContext *s, AVPacket *pkt)
}
#if CONFIG_DV_DEMUXER
if
(
mov
->
dv_demux
&&
sc
->
dv_audio_container
)
{
dv_produce_packet
(
mov
->
dv_demux
,
pkt
,
pkt
->
data
,
pkt
->
size
);
avpriv_
dv_produce_packet
(
mov
->
dv_demux
,
pkt
,
pkt
->
data
,
pkt
->
size
);
av_free
(
pkt
->
data
);
pkt
->
size
=
0
;
ret
=
dv_get_packet
(
mov
->
dv_demux
,
pkt
);
ret
=
avpriv_
dv_get_packet
(
mov
->
dv_demux
,
pkt
);
if
(
ret
<
0
)
return
ret
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录