diff options
| author | Martin Storsjö <martin@martin.st> | 2010-05-18 19:40:17 +0000 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2010-05-18 19:40:17 +0000 |
| commit | 27a826c941c2b0f685d97eeb21489cbd281728a7 (patch) | |
| tree | 686f9b93bd89a4c8605e7a489a05dd30d399c63a /libavformat | |
| parent | f72dad41427a641a55206904d4101efb65c29afd (diff) | |
| download | ffmpeg-27a826c941c2b0f685d97eeb21489cbd281728a7.tar.gz | |
Make mov_write_packet non-static, add ff_ prefix
Originally committed as revision 23163 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/movenc.c | 16 | ||||
| -rw-r--r-- | libavformat/movenc.h | 2 |
2 files changed, 10 insertions, 8 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 914bb2de12..41a95c9f00 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1785,7 +1785,7 @@ static int mov_parse_mpeg2_frame(AVPacket *pkt, uint32_t *flags) 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; ByteIOContext *pb = s->pb; @@ -1910,7 +1910,7 @@ static void mov_create_chapter_track(AVFormatContext *s, int tracknum) pkt.data = av_malloc(pkt.size); AV_WB16(pkt.data, len); memcpy(pkt.data+2, t->value, len); - mov_write_packet(s, &pkt); + ff_mov_write_packet(s, &pkt); av_freep(&pkt.data); } } @@ -2084,7 +2084,7 @@ AVOutputFormat mov_muxer = { CODEC_ID_AAC, CODEC_ID_MPEG4, mov_write_header, - mov_write_packet, + ff_mov_write_packet, mov_write_trailer, .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS, .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_H263, mov_write_header, - mov_write_packet, + ff_mov_write_packet, mov_write_trailer, .flags = AVFMT_GLOBALHEADER, .codec_tag = (const AVCodecTag* const []){codec_3gp_tags, 0}, @@ -2116,7 +2116,7 @@ AVOutputFormat mp4_muxer = { CODEC_ID_AAC, CODEC_ID_MPEG4, mov_write_header, - mov_write_packet, + ff_mov_write_packet, mov_write_trailer, .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS, .codec_tag = (const AVCodecTag* const []){ff_mp4_obj_type, 0}, @@ -2132,7 +2132,7 @@ AVOutputFormat psp_muxer = { CODEC_ID_AAC, CODEC_ID_MPEG4, mov_write_header, - mov_write_packet, + ff_mov_write_packet, mov_write_trailer, .flags = AVFMT_GLOBALHEADER, .codec_tag = (const AVCodecTag* const []){ff_mp4_obj_type, 0}, @@ -2148,7 +2148,7 @@ AVOutputFormat tg2_muxer = { CODEC_ID_AMR_NB, CODEC_ID_H263, mov_write_header, - mov_write_packet, + ff_mov_write_packet, mov_write_trailer, .flags = AVFMT_GLOBALHEADER, .codec_tag = (const AVCodecTag* const []){codec_3gp_tags, 0}, @@ -2164,7 +2164,7 @@ AVOutputFormat ipod_muxer = { CODEC_ID_AAC, CODEC_ID_H264, mov_write_header, - mov_write_packet, + ff_mov_write_packet, mov_write_trailer, .flags = AVFMT_GLOBALHEADER, .codec_tag = (const AVCodecTag* const []){codec_ipod_tags, 0}, diff --git a/libavformat/movenc.h b/libavformat/movenc.h index f490bd02a8..089701dcfe 100644 --- a/libavformat/movenc.h +++ b/libavformat/movenc.h @@ -85,4 +85,6 @@ typedef struct MOVMuxContext { MOVTrack *tracks; } MOVMuxContext; +int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt); + #endif /* AVFORMAT_MOVENC_H */ |