diff options
| author | Paul B Mahol <onemda@gmail.com> | 2013-09-08 12:35:31 +0000 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-09-08 21:44:06 +0200 |
| commit | f5ae34250a22430dec99666f3f63b9ff5996ef09 (patch) | |
| tree | daaa3c745a50f3120fd8116486e294233176f243 | |
| parent | fc4c29bc6efddc93a1a86c84ebdd49373478a139 (diff) | |
| download | ffmpeg-f5ae34250a22430dec99666f3f63b9ff5996ef09.tar.gz | |
avformat/matroskaenc: remove bogus prores tag
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
| -rw-r--r-- | libavformat/matroskaenc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 8a0e846b09..fbb18a6323 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1617,7 +1617,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 }, |