Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

Make mov_write_packet non-static, add ff_ prefix

Browse source 
Originally committed as revision 23163 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Martin Storsjö 2010-05-18 19:40:17 +00:00
parent f72dad4142
commit 27a826c941
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libavformat/movenc.c
View file

@ -1785,7 +1785,7 @@ static int mov_parse_mpeg2_frame(AVPacket *pkt, uint32_t *flags)
return 0; return 0;
} }
static int mov_write_packet(AVFormatContext *s, AVPacket *pkt) int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt)
{ {
MOVMuxContext *mov = s->priv_data; MOVMuxContext *mov = s->priv_data;
ByteIOContext *pb = s->pb; ByteIOContext *pb = s->pb;
@ -1910,7 +1910,7 @@ static void mov_create_chapter_track(AVFormatContext *s, int tracknum)
pkt.data = av_malloc(pkt.size); pkt.data = av_malloc(pkt.size);
AV_WB16(pkt.data, len); AV_WB16(pkt.data, len);
memcpy(pkt.data+2, t->value, len); memcpy(pkt.data+2, t->value, len);
mov_write_packet(s, &pkt); ff_mov_write_packet(s, &pkt);
av_freep(&pkt.data); av_freep(&pkt.data);
} }
} }
@ -2084,7 +2084,7 @@ AVOutputFormat mov_muxer = {
CODEC_ID_AAC, CODEC_ID_AAC,
CODEC_ID_MPEG4, CODEC_ID_MPEG4,
mov_write_header, mov_write_header,
mov_write_packet, ff_mov_write_packet,
mov_write_trailer, mov_write_trailer,
.flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS, .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS,
.codec_tag = (const AVCodecTag* const []){codec_movvideo_tags, codec_movaudio_tags, 0}, .codec_tag = (const AVCodecTag* const []){codec_movvideo_tags, codec_movaudio_tags, 0},
@ -2100,7 +2100,7 @@ AVOutputFormat tgp_muxer = {
CODEC_ID_AMR_NB, CODEC_ID_AMR_NB,
CODEC_ID_H263, CODEC_ID_H263,
mov_write_header, mov_write_header,
mov_write_packet, ff_mov_write_packet,
mov_write_trailer, mov_write_trailer,
.flags = AVFMT_GLOBALHEADER, .flags = AVFMT_GLOBALHEADER,
.codec_tag = (const AVCodecTag* const []){codec_3gp_tags, 0}, .codec_tag = (const AVCodecTag* const []){codec_3gp_tags, 0},
@ -2116,7 +2116,7 @@ AVOutputFormat mp4_muxer = {
CODEC_ID_AAC, CODEC_ID_AAC,
CODEC_ID_MPEG4, CODEC_ID_MPEG4,
mov_write_header, mov_write_header,
mov_write_packet, ff_mov_write_packet,
mov_write_trailer, mov_write_trailer,
.flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS, .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS,
.codec_tag = (const AVCodecTag* const []){ff_mp4_obj_type, 0}, .codec_tag = (const AVCodecTag* const []){ff_mp4_obj_type, 0},
@ -2132,7 +2132,7 @@ AVOutputFormat psp_muxer = {
CODEC_ID_AAC, CODEC_ID_AAC,
CODEC_ID_MPEG4, CODEC_ID_MPEG4,
mov_write_header, mov_write_header,
mov_write_packet, ff_mov_write_packet,
mov_write_trailer, mov_write_trailer,
.flags = AVFMT_GLOBALHEADER, .flags = AVFMT_GLOBALHEADER,
.codec_tag = (const AVCodecTag* const []){ff_mp4_obj_type, 0}, .codec_tag = (const AVCodecTag* const []){ff_mp4_obj_type, 0},
@ -2148,7 +2148,7 @@ AVOutputFormat tg2_muxer = {
CODEC_ID_AMR_NB, CODEC_ID_AMR_NB,
CODEC_ID_H263, CODEC_ID_H263,
mov_write_header, mov_write_header,
mov_write_packet, ff_mov_write_packet,
mov_write_trailer, mov_write_trailer,
.flags = AVFMT_GLOBALHEADER, .flags = AVFMT_GLOBALHEADER,
.codec_tag = (const AVCodecTag* const []){codec_3gp_tags, 0}, .codec_tag = (const AVCodecTag* const []){codec_3gp_tags, 0},
@ -2164,7 +2164,7 @@ AVOutputFormat ipod_muxer = {
CODEC_ID_AAC, CODEC_ID_AAC,
CODEC_ID_H264, CODEC_ID_H264,
mov_write_header, mov_write_header,
mov_write_packet, ff_mov_write_packet,
mov_write_trailer, mov_write_trailer,
.flags = AVFMT_GLOBALHEADER, .flags = AVFMT_GLOBALHEADER,
.codec_tag = (const AVCodecTag* const []){codec_ipod_tags, 0}, .codec_tag = (const AVCodecTag* const []){codec_ipod_tags, 0},

2
libavformat/movenc.h
View file

@ -85,4 +85,6 @@ typedef struct MOVMuxContext {
MOVTrack *tracks; MOVTrack *tracks;
} MOVMuxContext; } MOVMuxContext;
int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt);
#endif /* AVFORMAT_MOVENC_H */ #endif /* AVFORMAT_MOVENC_H */