[FFmpeg-cvslog] avformat/matroskaenc: remove bogus prores tag
Paul B Mahol
git at videolan.org
Sun Sep 8 22:51:53 CEST 2013
ffmpeg | branch: release/1.2 | Paul B Mahol <onemda at gmail.com> | Sun Sep 8 12:35:31 2013 +0000| [8f87e75c6c92eae64f16878481c0274f64dea82d] | 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=8f87e75c6c92eae64f16878481c0274f64dea82d
---
libavformat/matroskaenc.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index d5e91bb..e62d534 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -1414,7 +1414,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 },
More information about the ffmpeg-cvslog
mailing list