changeset 3990:9709530b68b5 libavformat

simplifying the code as per Michael's suggestion
author romansh
date Tue, 07 Oct 2008 15:49:45 +0000
parents 8b2c1cfecd94
children 3cc570fdebbf
files dv.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/dv.c	Sat Oct 04 23:30:35 2008 +0000
+++ b/dv.c	Tue Oct 07 15:49:45 2008 +0000
@@ -122,7 +122,7 @@
     half_ch = sys->difseg_size/2;
 
     /* We work with 720p frames split in half, thus even frames have channels 0,1 and odd 2,3 */
-    ipcm = (sys->height == 720 && ((frame[1]>>2)&0x3) == 0)?2:0;
+    ipcm = (sys->height == 720 && !(frame[1]&0x0C))?2:0;
     pcm = ppcm[ipcm++];
 
     /* for each DIF channel */
@@ -339,7 +339,7 @@
 
     /* 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]>>2)&0x3))
+        if (buf[1]&0x0C)
             c->audio_pkt[2].size = c->audio_pkt[3].size = 0;
         else
             c->audio_pkt[0].size = c->audio_pkt[1].size = 0;