summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authorrtognimp <rtognimp@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-03-27 21:37:18 +0000
committerrtognimp <rtognimp@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-03-27 21:37:18 +0000
commit9c2deb145234a6fc8e70a88fd71c559d74b9df81 (patch)
treeafed51ccee88b0f92144e71008bcffdd8d17eb23 /libmpdemux
parent3256ed536da3fe16086c6394802a566caa795146 (diff)
downloadmpv-9c2deb145234a6fc8e70a88fd71c559d74b9df81.tar.bz2
mpv-9c2deb145234a6fc8e70a88fd71c559d74b9df81.tar.xz
Fix passing qdm2 extradata to lavc decoder
It was broken in rev 1.142, that code does not behave the same as the old one in some cases git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17983 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demux_mov.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c
index eaffa1f963..5465d19d94 100644
--- a/libmpdemux/demux_mov.c
+++ b/libmpdemux/demux_mov.c
@@ -745,7 +745,11 @@ static void lschunks(demuxer_t* demuxer,int level,off_t endpos,mov_track_t* trak
mp_msg(MSGT_DEMUX, MSGL_V, "MOV: Found little endian PCM data, reversed fourcc:%04x\n", sh->format);
}
break;
- default: break;
+ default:
+ if (len > 8 && len + 44 <= trak->stdata_len) {
+ sh->codecdata_len = len-8;
+ sh->codecdata = trak->stdata+44+8;
+ }
}
} else {
if (len > 8 && len + 44 <= trak->stdata_len) {