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/mpegts.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/mpegts.c')
| -rw-r--r-- | libavformat/mpegts.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 959be31577..e8f31d6d0b 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -158,7 +158,7 @@ typedef struct PESContext { uint8_t *buffer; } PESContext; -extern AVInputFormat mpegts_demuxer; +extern AVInputFormat ff_mpegts_demuxer; static void clear_program(MpegTSContext *ts, unsigned int programid) { @@ -1468,7 +1468,7 @@ static int mpegts_read_header(AVFormatContext *s, ts->stream = s; ts->auto_guess = 0; - if (s->iformat == &mpegts_demuxer) { + if (s->iformat == &ff_mpegts_demuxer) { /* normal demux */ /* first do a scaning to get all the services */ @@ -1845,7 +1845,7 @@ void ff_mpegts_parse_close(MpegTSContext *ts) av_free(ts); } -AVInputFormat mpegts_demuxer = { +AVInputFormat ff_mpegts_demuxer = { "mpegts", NULL_IF_CONFIG_SMALL("MPEG-2 transport stream format"), sizeof(MpegTSContext), @@ -1861,7 +1861,7 @@ AVInputFormat mpegts_demuxer = { #endif }; -AVInputFormat mpegtsraw_demuxer = { +AVInputFormat ff_mpegtsraw_demuxer = { "mpegtsraw", NULL_IF_CONFIG_SMALL("MPEG-2 raw transport stream format"), sizeof(MpegTSContext), |