highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

simplifying code as per Michael's suggestion

Browse Source 
Originally committed as revision 15583 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Roman Shaposhnik 2008-10-07 16:14:33 +00:00
parent 45580f8d4d
commit a53621fca8
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/dv.c
View File

@ -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++) {