From 14851ca5f5a3af140085e82589e28e06c7cdefdc Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Sun, 8 Sep 2013 12:35:31 +0000 Subject: [PATCH] avformat/matroskaenc: remove bogus prores tag Fixes: ffmpeg -i input -c:v prores output.mkv Signed-off-by: Paul B Mahol --- libavformat/matroskaenc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index b6cf9dd262..7b69bc3abf 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1699,7 +1699,6 @@ static const AVCodecTag additional_audio_tags[] = { }; static 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 },