comparison cook.c @ 9648:62d00a9c3824 libavcodec

Bugfix for bug introduced in the multichannel cook patchset.
author banan
date Fri, 15 May 2009 16:25:54 +0000
parents 5c1aeaf1bc12
children 67a20f0eb42c
comparison
equal deleted inserted replaced
9647:d0fe5dc427f0 9648:62d00a9c3824
1139 return -1; 1139 return -1;
1140 } 1140 }
1141 av_log(avctx,AV_LOG_DEBUG,"MONO\n"); 1141 av_log(avctx,AV_LOG_DEBUG,"MONO\n");
1142 break; 1142 break;
1143 case STEREO: 1143 case STEREO:
1144 if (q->nb_channels != 1) 1144 if (q->nb_channels != 1) {
1145 q->subpacket[s].bits_per_subpdiv = 1; 1145 q->subpacket[s].bits_per_subpdiv = 1;
1146 q->subpacket[s].num_channels = 2; 1146 q->subpacket[s].num_channels = 2;
1147 }
1147 av_log(avctx,AV_LOG_DEBUG,"STEREO\n"); 1148 av_log(avctx,AV_LOG_DEBUG,"STEREO\n");
1148 break; 1149 break;
1149 case JOINT_STEREO: 1150 case JOINT_STEREO:
1150 if (q->nb_channels != 2) { 1151 if (q->nb_channels != 2) {
1151 av_log(avctx,AV_LOG_ERROR,"Container channels != 2, report sample!\n"); 1152 av_log(avctx,AV_LOG_ERROR,"Container channels != 2, report sample!\n");