Commit a53621fc authored by Roman Shaposhnik's avatar Roman Shaposhnik

simplifying code as per Michael's suggestion

Originally committed as revision 15583 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 45580f8d
...@@ -201,10 +201,9 @@ static int dv_extract_audio_info(DVDemuxContext* c, uint8_t* frame) ...@@ -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 */ quant = as_pack[4] & 0x07; /* 0 - 16bit linear, 1 - 12bit nonlinear */
/* note: ach counts PAIRS of channels (i.e. stereo channels) */ /* 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 */ /* Dynamic handling of the audio streams in DV */
for (i=0; i<ach; i++) { for (i=0; i<ach; i++) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment