diff options
| author | Diego Elio Pettenò <flameeyes@gmail.com> | 2011-01-25 22:03:28 +0000 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2011-01-26 22:10:09 +0000 |
| commit | c6610a216ed2948885772154a2eed696e0cb4aca (patch) | |
| tree | 7ea6d3fdf9a8c957a5e690af2331ab481b1eb141 /libavformat/matroskaenc.c | |
| parent | 225b6d7fdea370de3723420e6adc2f3192439b00 (diff) | |
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.
Diffstat (limited to 'libavformat/matroskaenc.c')
| -rw-r--r-- | libavformat/matroskaenc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index dc08c18f50..a288c7f85f 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1177,7 +1177,7 @@ static int mkv_write_trailer(AVFormatContext *s) } #if CONFIG_MATROSKA_MUXER -AVOutputFormat matroska_muxer = { +AVOutputFormat ff_matroska_muxer = { "matroska", NULL_IF_CONFIG_SMALL("Matroska file format"), "video/x-matroska", @@ -1195,7 +1195,7 @@ AVOutputFormat matroska_muxer = { #endif #if CONFIG_WEBM_MUXER -AVOutputFormat webm_muxer = { +AVOutputFormat ff_webm_muxer = { "webm", NULL_IF_CONFIG_SMALL("WebM file format"), "video/webm", @@ -1211,7 +1211,7 @@ AVOutputFormat webm_muxer = { #endif #if CONFIG_MATROSKA_AUDIO_MUXER -AVOutputFormat matroska_audio_muxer = { +AVOutputFormat ff_matroska_audio_muxer = { "matroska", NULL_IF_CONFIG_SMALL("Matroska file format"), "audio/x-matroska", |