aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2011-09-19 12:20:42 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-09-21 20:56:53 +0200
commit9442f50c33232baed3a20f8b82c181f36b4ebe64 (patch)
treeab551e97bb88c720955119a0e5665109877525d4
parent89bd2307f52c3eceb50df64cd7a62c35fe9ee189 (diff)
downloadffmpeg-9442f50c33232baed3a20f8b82c181f36b4ebe64.tar.gz
Support 3IVD in isom, produced by 3ivx DivX Doctor.
Fixes ticket #486. (cherry picked from commit 4a9b069b6742f78ed7511d2a87af621ab1d43a59)
-rw-r--r--libavformat/isom.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c
index 09ee23bdfd..1f75a4a956 100644
--- a/libavformat/isom.c
+++ b/libavformat/isom.c
@@ -208,6 +208,8 @@ const AVCodecTag codec_movvideo_tags[] = {
{ CODEC_ID_PRORES, MKTAG('a', 'p', 'c', 'o') }, /* Apple ProRes 422 Proxy */
{ CODEC_ID_PRORES, MKTAG('a', 'p', '4', 'h') }, /* Apple ProRes 4444 */
+ { CODEC_ID_MSMPEG4V3, MKTAG('3', 'I', 'V', 'D') }, /* 3ivx DivX Doctor */
+
{ CODEC_ID_NONE, 0 },
};