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/avienc.c | |
| parent | ebf3ee16c765811fe3ab0c8a295ada0e2f5eca44 (diff) | |
| download | android_external_ffmpeg-66355be3c3eb8e797589058b0773f773a8c2231e.tar.gz android_external_ffmpeg-66355be3c3eb8e797589058b0773f773a8c2231e.tar.bz2 android_external_ffmpeg-66355be3c3eb8e797589058b0773f773a8c2231e.zip | |
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/avienc.c')
| -rw-r--r-- | libavformat/avienc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/avienc.c b/libavformat/avienc.c index 98b0ad713c..3397657083 100644 --- a/libavformat/avienc.c +++ b/libavformat/avienc.c @@ -630,7 +630,7 @@ static int avi_write_trailer(AVFormatContext *s) return res; } -AVOutputFormat avi_muxer = { +AVOutputFormat ff_avi_muxer = { "avi", NULL_IF_CONFIG_SMALL("AVI format"), "video/x-msvideo", |