[FFmpeg-cvslog] avformat/matroskaenc: remove bogus prores tag

[Paul B Mahol]

ffmpeg | branch: release/1.1 | Paul B Mahol <onemda at gmail.com> | Sun Sep  8 12:35:31 2013 +0000| [8715ca0b82c1a1cc2ec9998acca990bbe63d4a34] | committer: Carl Eugen Hoyos

avformat/matroskaenc: remove bogus prores tag

Fixes: ffmpeg -i input -c:v prores output.mkv

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

Conflicts:
	libavformat/matroskaenc.c

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8715ca0b82c1a1cc2ec9998acca990bbe63d4a34
---

 libavformat/matroskaenc.c |    1 -
 1 file changed, 1 deletion(-)

diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index 05d0c36..e746eee 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -1383,7 +1383,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 },