In mov muxer, mux adpcm_ms and adpcm_ima_wav the way quicktime supports it

[ffmpeg] / libavformat / flic.c

diff --git a/libavformat/flic.c b/libavformat/flic.c
index 51320c9da3d80a2010c716613f2b3ac675722e93..bf93c5c9b6865c31330b73247d547c2474921ac7 100644 (file)
--- a/libavformat/flic.c
+++ b/libavformat/flic.c
@@ -259,7 +259,7 @@ static int flic_read_packet(AVFormatContext *s,
     return ret;
 }
 
-AVInputFormat flic_demuxer = {
+AVInputFormat ff_flic_demuxer = {
     "flic",
     NULL_IF_CONFIG_SMALL("FLI/FLC/FLX animation format"),
     sizeof(FlicDemuxContext),