avformat/matroskaenc: remove bogus prores tag
authorPaul B Mahol <onemda@gmail.com>
Sun, 8 Sep 2013 12:35:31 +0000 (12:35 +0000)
committerCarl Eugen Hoyos <cehoyos@ag.or.at>
Sun, 8 Sep 2013 20:39:28 +0000 (22:39 +0200)
commit8b282d9d8b786397b75e11c74529d0ad033f76f0
treefbc52e58f4cc52aaf2f6c893a9b98e736203d438
parentfcd46cfbbd90564232dc10a2d4753bf0f251ae98
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
libavformat/matroskaenc.c