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 19:44:06 +0000 (21:44 +0200)
commitf5ae34250a22430dec99666f3f63b9ff5996ef09
treedaaa3c745a50f3120fd8116486e294233176f243
parentfc4c29bc6efddc93a1a86c84ebdd49373478a139
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