simplifying code as per Michael's suggestion

Originally committed as revision 15583 to svn://svn.ffmpeg.org/ffmpeg/trunk

simplifying code as per Michael's suggestion
Originally committed as revision 15583 to svn://svn.ffmpeg.org/ffmpeg/trunk
a53621fc · Roman Shaposhnik · 45580f8d · a53621fc
Commit a53621fc authored Oct 07, 2008 by Roman Shaposhnik
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

dv.c libavformat/dv.c +3 -4

No files found.
--- a/libavformat/dv.c
+++ b/libavformat/dv.c
@@ -201,10 +201,9 @@ static int dv_extract_audio_info(DVDemuxContext* c, uint8_t* frame)
    quant = as_pack[4] & 0x07; /* 0 - 16bit linear, 1 - 12bit nonlinear */
    /* note: ach counts PAIRS of channels (i.e. stereo channels) */
-    if (stype == 3) {
+    ach = (int[4]){  1,  0,  2,  4}[stype];
-        ach = 4;
+    if (ach == 1 && quant && freq == 2)
-    } else
+        ach = 2;
-    ach = (stype == 2 || (quant && (freq == 2))) ? 2 : 1;
    /* Dynamic handling of the audio streams in DV */
    for (i=0; i<ach; i++) {