# HG changeset patch # User mstorsjo # Date 1274211617 0 # Node ID 8298cc054242d99b19d531bd07070ae790959c74 # Parent 97fdefab56cd29901943d0f0d64c89bf8cb45817 Make mov_write_packet non-static, add ff_ prefix diff -r 97fdefab56cd -r 8298cc054242 movenc.c --- a/movenc.c Tue May 18 19:38:37 2010 +0000 +++ b/movenc.c Tue May 18 19:40:17 2010 +0000 @@ -1785,7 +1785,7 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 -r 97fdefab56cd -r 8298cc054242 movenc.h --- a/movenc.h Tue May 18 19:38:37 2010 +0000 +++ b/movenc.h Tue May 18 19:40:17 2010 +0000 @@ -85,4 +85,6 @@ MOVTrack *tracks; } MOVMuxContext; +int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt); + #endif /* AVFORMAT_MOVENC_H */