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/ffmdec.c | |
| parent | ebf3ee16c765811fe3ab0c8a295ada0e2f5eca44 (diff) | |
| download | ffmpeg-streaming-66355be3c3eb8e797589058b0773f773a8c2231e.zip ffmpeg-streaming-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/ffmdec.c')
| -rw-r--r-- | libavformat/ffmdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c index 050702e..b2fc0cd 100644 --- a/libavformat/ffmdec.c +++ b/libavformat/ffmdec.c @@ -518,7 +518,7 @@ static int ffm_probe(AVProbeData *p) return 0; } -AVInputFormat ffm_demuxer = { +AVInputFormat ff_ffm_demuxer = { "ffm", NULL_IF_CONFIG_SMALL("FFM (FFserver live feed) format"), sizeof(FFMContext), |
