generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat/matroskaenc: remove bogus prores tag

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

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

Conflicts:
	libavformat/matroskaenc.c
This commit is contained in:
Paul B Mahol
2013-09-08 12:35:31 +00:00
committed by Carl Eugen Hoyos
parent 06a927a6b5
commit 8f87e75c6c
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libavformat/matroskaenc.c
View File

@@ -1414,7 +1414,6 @@ const AVCodecTag additional_audio_tags[] = {
}; };
const AVCodecTag additional_video_tags[] = { const AVCodecTag additional_video_tags[] = {
{ AV_CODEC_ID_PRORES, 0xFFFFFFFF },
{ AV_CODEC_ID_RV10, 0xFFFFFFFF }, { AV_CODEC_ID_RV10, 0xFFFFFFFF },
{ AV_CODEC_ID_RV20, 0xFFFFFFFF }, { AV_CODEC_ID_RV20, 0xFFFFFFFF },
{ AV_CODEC_ID_RV30, 0xFFFFFFFF }, { AV_CODEC_ID_RV30, 0xFFFFFFFF },