summaryrefslogtreecommitdiff
path: root/libavformat/4xm.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2007-08-12 00:23:47 +0000
committerMichael Niedermayer <michaelni@gmx.at>2007-08-12 00:23:47 +0000
commit07870f85378e2556b017a3b1544394ea7eee9905 (patch)
treecb697bcefa79d69e07170f72435c8b8672269e8f /libavformat/4xm.c
parent880003bbb915c28db5cfdf2cac79d9fe8838ef09 (diff)
pass *fr2 chunks to decoder (Toy-Story2_better-image-quality.4xa contains them)
Originally committed as revision 10085 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/4xm.c')
-rw-r--r--libavformat/4xm.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/libavformat/4xm.c b/libavformat/4xm.c
index 87dad7dbb0..4c52f8a0e6 100644
--- a/libavformat/4xm.c
+++ b/libavformat/4xm.c
@@ -44,6 +44,9 @@
#define ifrm_TAG MKTAG('i', 'f', 'r', 'm')
#define pfrm_TAG MKTAG('p', 'f', 'r', 'm')
#define cfrm_TAG MKTAG('c', 'f', 'r', 'm')
+#define ifr2_TAG MKTAG('i', 'f', 'r', '2')
+#define pfr2_TAG MKTAG('p', 'f', 'r', '2')
+#define cfr2_TAG MKTAG('c', 'f', 'r', '2')
#define snd__TAG MKTAG('s', 'n', 'd', '_')
#define vtrk_SIZE 0x44
@@ -248,7 +251,11 @@ static int fourxm_read_packet(AVFormatContext *s,
case ifrm_TAG:
case pfrm_TAG:
- case cfrm_TAG:{
+ case cfrm_TAG:
+ case ifr2_TAG:
+ case pfr2_TAG:
+ case cfr2_TAG:
+ {
/* allocate 8 more bytes than 'size' to account for fourcc
* and size */