From 8a4ea200e1c823011ba7695d1e0ff13e3120a221 Mon Sep 17 00:00:00 2001 From: Brian Brice Date: Fri, 19 Jun 2009 21:36:21 +0000 Subject: fix dvcprohd 720p channels 3 and 4 audio timestamps, patch by Brian Brice, bbrice at gmail dot com Originally committed as revision 19228 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/dv.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'libavformat/dv.c') diff --git a/libavformat/dv.c b/libavformat/dv.c index 78e3b38d18..a75b4a6b0d 100644 --- a/libavformat/dv.c +++ b/libavformat/dv.c @@ -336,15 +336,18 @@ int dv_produce_packet(DVDemuxContext *c, AVPacket *pkt, ppcm[i] = c->audio_buf[i]; } dv_extract_audio(buf, ppcm, c->sys); - c->abytes += size; /* We work with 720p frames split in half, thus even frames have * channels 0,1 and odd 2,3. */ if (c->sys->height == 720) { - if (buf[1] & 0x0C) + if (buf[1] & 0x0C) { c->audio_pkt[2].size = c->audio_pkt[3].size = 0; - else + } else { c->audio_pkt[0].size = c->audio_pkt[1].size = 0; + c->abytes += size; + } + } else { + c->abytes += size; } /* Now it's time to return video packet */ -- cgit v1.2.3