avformat/matroskaenc: remove bogus prores tag
authorPaul B Mahol <onemda@gmail.com>
Sun, 8 Sep 2013 12:35:31 +0000 (12:35 +0000)
committerCarl Eugen Hoyos <cehoyos@ag.or.at>
Sun, 8 Sep 2013 20:39:28 +0000 (22:39 +0200)
Fixes: ffmpeg -i input -c:v prores output.mkv

Signed-off-by: Paul B Mahol <onemda@gmail.com>
(cherry picked from commit 14851ca5f5a3af140085e82589e28e06c7cdefdc)

Conflicts:
libavformat/matroskaenc.c

libavformat/matroskaenc.c

index bfe3fb9..e599970 100644 (file)
@@ -1355,7 +1355,6 @@ const AVCodecTag additional_audio_tags[] = {
 };
 
 const AVCodecTag additional_video_tags[] = {
-    { AV_CODEC_ID_PRORES,    0xFFFFFFFF },
     { AV_CODEC_ID_RV10,      0xFFFFFFFF },
     { AV_CODEC_ID_RV20,      0xFFFFFFFF },
     { AV_CODEC_ID_RV30,      0xFFFFFFFF },