comparison parser.c @ 1987:d9e067853051 libavcodec

>2 channels decoding fix

1986:c8e866f4515f

                    s->inbuf_ptr--;
                } else {
		    s->frame_size = len;
                    /* update codec info */
                    avctx->sample_rate = sample_rate;
                    avctx->channels = ac3_channels[s->flags & 7];
                    if (s->flags & A52_LFE)
			avctx->channels++;
		    avctx->bit_rate = bit_rate;
                    avctx->frame_size = 6 * 256;
                }
            }
        } else if (len < s->frame_size) {

1987:d9e067853051

                    s->inbuf_ptr--;
                } else {
		    s->frame_size = len;
                    /* update codec info */
                    avctx->sample_rate = sample_rate;
                    /* set channels,except if the user explicitly requests 1 or 2 channels, XXX/FIXME this is a bit ugly */
                    if(avctx->channels!=1 && avctx->channels!=2){
                        avctx->channels = ac3_channels[s->flags & 7];
                        if (s->flags & A52_LFE)
                            avctx->channels++;
                    }
		    avctx->bit_rate = bit_rate;
                    avctx->frame_size = 6 * 256;
                }
            }
        } else if (len < s->frame_size) {