[FFmpeg-devel] [PATCH 1/2] Move XCH parameters into context structure

[Kostya]

On Sat, Jul 10, 2010 at 09:46:19PM +0100, Nick Brereton wrote:
> Patch 1/2 to fix side channels when DTS-ES matrix is flagged *and*
> DTS-ES discrete is also present in XCh extension.

looks ok except for one nit:

> Index: libavcodec/dca.c
> ===================================================================
> --- libavcodec/dca.c	(revision 24162)
> +++ libavcodec/dca.c	(working copy)
> @@ -288,6 +288,10 @@
>      int current_subframe;
>      int current_subsubframe;
>  
> +    /* XCh extension information */
> +    int xch_present;
> +    int xch_base_channel;       ///< index of first (only) channel containing XCH data
> +
>      int debug_flag;             ///< used for suppressing repeated error messages output
>      DSPContext dsp;
>      FFTContext imdct;
> @@ -1260,12 +1264,11 @@
>      int lfe_samples;
>      int num_core_channels = 0;
>      int i;
> -    int xch_present = 0;
>      int16_t *samples = data;
>      DCAContext *s = avctx->priv_data;
>      int channels;
>  
> -
> +    s->xch_present = 0;
>      s->dca_buffer_size = dca_convert_bitstream(buf, buf_size, s->dca_buffer, DCA_MAX_FRAME_SIZE);
>      if (s->dca_buffer_size == -1) {
>          av_log(avctx, AV_LOG_ERROR, "Not a valid DCA frame\n");

please do not remove empty lines without good reason