diff options
| author | Diego Elio Pettenò <flameeyes@gmail.com> | 2011-01-25 22:03:28 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-01-28 03:15:34 +0100 |
| commit | 66355be3c3eb8e797589058b0773f773a8c2231e (patch) | |
| tree | 8dfe2254904eafda194acc98c465bf2ece7f69a6 /libavformat/movenc.c | |
| parent | ebf3ee16c765811fe3ab0c8a295ada0e2f5eca44 (diff) | |
| download | ffmpeg-66355be3c3eb8e797589058b0773f773a8c2231e.tar.gz | |
Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.
This also lists the objects from those two libraries as internal (by adding
the ff_ prefix) so that they can then be hidden via linker scripts.
(cherry picked from commit c6610a216ed2948885772154a2eed696e0cb4aca)
Diffstat (limited to 'libavformat/movenc.c')
| -rw-r--r-- | libavformat/movenc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 6fe5da7f99..606170150c 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -2232,7 +2232,7 @@ static int mov_write_trailer(AVFormatContext *s) } #if CONFIG_MOV_MUXER -AVOutputFormat mov_muxer = { +AVOutputFormat ff_mov_muxer = { "mov", NULL_IF_CONFIG_SMALL("MOV format"), NULL, @@ -2248,7 +2248,7 @@ AVOutputFormat mov_muxer = { }; #endif #if CONFIG_TGP_MUXER -AVOutputFormat tgp_muxer = { +AVOutputFormat ff_tgp_muxer = { "3gp", NULL_IF_CONFIG_SMALL("3GP format"), NULL, @@ -2264,7 +2264,7 @@ AVOutputFormat tgp_muxer = { }; #endif #if CONFIG_MP4_MUXER -AVOutputFormat mp4_muxer = { +AVOutputFormat ff_mp4_muxer = { "mp4", NULL_IF_CONFIG_SMALL("MP4 format"), "application/mp4", @@ -2280,7 +2280,7 @@ AVOutputFormat mp4_muxer = { }; #endif #if CONFIG_PSP_MUXER -AVOutputFormat psp_muxer = { +AVOutputFormat ff_psp_muxer = { "psp", NULL_IF_CONFIG_SMALL("PSP MP4 format"), NULL, @@ -2296,7 +2296,7 @@ AVOutputFormat psp_muxer = { }; #endif #if CONFIG_TG2_MUXER -AVOutputFormat tg2_muxer = { +AVOutputFormat ff_tg2_muxer = { "3g2", NULL_IF_CONFIG_SMALL("3GP2 format"), NULL, @@ -2312,7 +2312,7 @@ AVOutputFormat tg2_muxer = { }; #endif #if CONFIG_IPOD_MUXER -AVOutputFormat ipod_muxer = { +AVOutputFormat ff_ipod_muxer = { "ipod", NULL_IF_CONFIG_SMALL("iPod H.264 MP4 format"), "application/mp4", |