Merge commit '5ac673b5531d846b79a3d77e3e932e0cb1234c45'

* commit '5ac673b5531d846b79a3d77e3e932e0cb1234c45':
  atrac3: use AVCodecContext.channels instead of keeping a private copy
  atrac3: simplify some loop indexing
  atrac3: cosmetics: pretty-printing and renaming
  pcm: define AVCodec instances only for enabled codecs
  libxvid: remove useless doxy comments.
  lavc: remove stats_out from the options table.

Conflicts:
	libavcodec/atrac3.c
	libavcodec/pcm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/atrac3.c
index b900882a7a0e026d4a3b23b09cf762ef849d8aa9,40f2a6d15fdfe69cfcec5862267b669883784a13..28994a8f9a5c49960b7129dbc1271f920799fad0
--- 1/libavcodec/atrac3.c
--- 2/libavcodec/atrac3.c
+++ b/libavcodec/atrac3.c
@@@ -37,9 -37,7 +37,8 @@@
  #include <stdio.h>
  
  #include "libavutil/float_dsp.h"
 +#include "libavutil/libm.h"
  #include "avcodec.h"
- #include "get_bits.h"
  #include "bytestream.h"
  #include "fft.h"
  #include "fmtconvert.h"
@@@ -581,34 -572,33 +573,33 @@@ static void reverse_matrixing(float *su
  
          /* Apply the matrix without interpolation. */
          switch (s2) {
-             case 0:     /* M/S decoding */
-                 for (; nsample < 256; nsample++) {
-                     c1 = su1[band+nsample];
-                     c2 = su2[band+nsample];
-                     su1[band+nsample] = c2 * 2.0;
-                     su2[band+nsample] = (c1 - c2) * 2.0;
-                 }
-                 break;
- 
-             case 1:
-                 for (; nsample < 256; nsample++) {
-                     c1 = su1[band+nsample];
-                     c2 = su2[band+nsample];
-                     su1[band+nsample] = (c1 + c2) * 2.0;
-                     su2[band+nsample] = c2 * -2.0;
-                 }
-                 break;
-             case 2:
-             case 3:
-                 for (; nsample < 256; nsample++) {
-                     c1 = su1[band+nsample];
-                     c2 = su2[band+nsample];
-                     su1[band+nsample] = c1 + c2;
-                     su2[band+nsample] = c1 - c2;
-                 }
-                 break;
-             default:
-                 av_assert1(0);
+         case 0:     /* M/S decoding */
+             for (; nsample < band + 256; nsample++) {
+                 float c1 = su1[nsample];
+                 float c2 = su2[nsample];
+                 su1[nsample] =  c2       * 2.0;
+                 su2[nsample] = (c1 - c2) * 2.0;
+             }
+             break;
+         case 1:
+             for (; nsample < band + 256; nsample++) {
+                 float c1 = su1[nsample];
+                 float c2 = su2[nsample];
+                 su1[nsample] = (c1 + c2) *  2.0;
+                 su2[nsample] =  c2       * -2.0;
+             }
+             break;
+         case 2:
+         case 3:
+             for (; nsample < band + 256; nsample++) {
+                 float c1 = su1[nsample];
+                 float c2 = su2[nsample];
+                 su1[nsample] = c1 + c2;
+                 su2[nsample] = c1 - c2;
+             }
+             break;
+         default:
 -            assert(0);
++            av_assert1(0);
          }
      }
  }
@@@ -996,12 -975,12 +976,12 @@@ static av_cold int atrac3_decode_init(A
  
      ff_atrac_generate_tables();
  
-     /* Generate gain tables. */
-     for (i=0 ; i<16 ; i++)
+     /* Generate gain tables */
+     for (i = 0; i < 16; i++)
 -        gain_tab1[i] = powf(2.0, (4 - i));
 +        gain_tab1[i] = exp2f (4 - i);
  
-     for (i=-15 ; i<16 ; i++)
-         gain_tab2[i+15] = exp2f (i * -0.125);
+     for (i = -15; i < 16; i++)
 -        gain_tab2[i + 15] = powf(2.0, i * -0.125);
++        gain_tab2[i + 15] = exp2f (i * -0.125);
  
      /* init the joint-stereo decoding data */
      q->weighting_delay[0] = 0;

diff --cc libavcodec/atrac3data.h
Simple merge

diff --cc libavcodec/libxvid.c
Simple merge

diff --cc libavcodec/options_table.h
Simple merge

diff --cc libavcodec/pcm.c
index e2ae9f964c8d9d5d91eb826cafd8a982ff3bed5d,1f8f22d172b51eeebc6aabe75484eb66435ca989..7f4db373fbbf73493e0367e3ff4c312a963c2057
--- 1/libavcodec/pcm.c
--- 2/libavcodec/pcm.c
+++ b/libavcodec/pcm.c
@@@ -518,29 -524,28 +526,29 @@@ AVCodec ff_ ## name_ ## _decoder = 
      PCM_DECODER(id, sample_fmt_, name, long_name_)
  
  /* Note: Do not forget to add new entries to the Makefile as well. */
- PCM_CODEC  (AV_CODEC_ID_PCM_ALAW,         AV_SAMPLE_FMT_S16, pcm_alaw,         "PCM A-law / G.711 A-law");
- PCM_DECODER(AV_CODEC_ID_PCM_DVD,          AV_SAMPLE_FMT_S32, pcm_dvd,          "PCM signed 20|24-bit big-endian");
- PCM_CODEC  (AV_CODEC_ID_PCM_F32BE,        AV_SAMPLE_FMT_FLT, pcm_f32be,        "PCM 32-bit floating point big-endian");
- PCM_CODEC  (AV_CODEC_ID_PCM_F32LE,        AV_SAMPLE_FMT_FLT, pcm_f32le,        "PCM 32-bit floating point little-endian");
- PCM_CODEC  (AV_CODEC_ID_PCM_F64BE,        AV_SAMPLE_FMT_DBL, pcm_f64be,        "PCM 64-bit floating point big-endian");
- PCM_CODEC  (AV_CODEC_ID_PCM_F64LE,        AV_SAMPLE_FMT_DBL, pcm_f64le,        "PCM 64-bit floating point little-endian");
- PCM_DECODER(AV_CODEC_ID_PCM_LXF,          AV_SAMPLE_FMT_S32P,pcm_lxf,          "PCM signed 20-bit little-endian planar");
- PCM_CODEC  (AV_CODEC_ID_PCM_MULAW,        AV_SAMPLE_FMT_S16, pcm_mulaw,        "PCM mu-law / G.711 mu-law");
- PCM_CODEC  (AV_CODEC_ID_PCM_S8,           AV_SAMPLE_FMT_U8,  pcm_s8,           "PCM signed 8-bit");
- PCM_CODEC  (AV_CODEC_ID_PCM_S16BE,        AV_SAMPLE_FMT_S16, pcm_s16be,        "PCM signed 16-bit big-endian");
- PCM_CODEC  (AV_CODEC_ID_PCM_S16LE,        AV_SAMPLE_FMT_S16, pcm_s16le,        "PCM signed 16-bit little-endian");
- PCM_DECODER(AV_CODEC_ID_PCM_S16LE_PLANAR, AV_SAMPLE_FMT_S16P,pcm_s16le_planar, "PCM 16-bit little-endian planar");
- PCM_CODEC  (AV_CODEC_ID_PCM_S24BE,        AV_SAMPLE_FMT_S32, pcm_s24be,        "PCM signed 24-bit big-endian");
- PCM_CODEC  (AV_CODEC_ID_PCM_S24DAUD,      AV_SAMPLE_FMT_S16, pcm_s24daud,      "PCM D-Cinema audio signed 24-bit");
- PCM_CODEC  (AV_CODEC_ID_PCM_S24LE,        AV_SAMPLE_FMT_S32, pcm_s24le,        "PCM signed 24-bit little-endian");
- PCM_CODEC  (AV_CODEC_ID_PCM_S32BE,        AV_SAMPLE_FMT_S32, pcm_s32be,        "PCM signed 32-bit big-endian");
- PCM_CODEC  (AV_CODEC_ID_PCM_S32LE,        AV_SAMPLE_FMT_S32, pcm_s32le,        "PCM signed 32-bit little-endian");
- PCM_CODEC  (AV_CODEC_ID_PCM_U8,           AV_SAMPLE_FMT_U8,  pcm_u8,           "PCM unsigned 8-bit");
- PCM_CODEC  (AV_CODEC_ID_PCM_U16BE,        AV_SAMPLE_FMT_S16, pcm_u16be,        "PCM unsigned 16-bit big-endian");
- PCM_CODEC  (AV_CODEC_ID_PCM_U16LE,        AV_SAMPLE_FMT_S16, pcm_u16le,        "PCM unsigned 16-bit little-endian");
- PCM_CODEC  (AV_CODEC_ID_PCM_U24BE,        AV_SAMPLE_FMT_S32, pcm_u24be,        "PCM unsigned 24-bit big-endian");
- PCM_CODEC  (AV_CODEC_ID_PCM_U24LE,        AV_SAMPLE_FMT_S32, pcm_u24le,        "PCM unsigned 24-bit little-endian");
- PCM_CODEC  (AV_CODEC_ID_PCM_U32BE,        AV_SAMPLE_FMT_S32, pcm_u32be,        "PCM unsigned 32-bit big-endian");
- PCM_CODEC  (AV_CODEC_ID_PCM_U32LE,        AV_SAMPLE_FMT_S32, pcm_u32le,        "PCM unsigned 32-bit little-endian");
- PCM_DECODER(AV_CODEC_ID_PCM_ZORK,         AV_SAMPLE_FMT_U8,  pcm_zork,         "PCM Zork");
 -PCM_CODEC  (PCM_ALAW,         AV_SAMPLE_FMT_S16, pcm_alaw,         "PCM A-law");
++PCM_CODEC  (PCM_ALAW,         AV_SAMPLE_FMT_S16, pcm_alaw,         "PCM A-law / G.711 A-law");
+ PCM_DECODER(PCM_DVD,          AV_SAMPLE_FMT_S32, pcm_dvd,          "PCM signed 20|24-bit big-endian");
+ PCM_CODEC  (PCM_F32BE,        AV_SAMPLE_FMT_FLT, pcm_f32be,        "PCM 32-bit floating point big-endian");
+ PCM_CODEC  (PCM_F32LE,        AV_SAMPLE_FMT_FLT, pcm_f32le,        "PCM 32-bit floating point little-endian");
+ PCM_CODEC  (PCM_F64BE,        AV_SAMPLE_FMT_DBL, pcm_f64be,        "PCM 64-bit floating point big-endian");
+ PCM_CODEC  (PCM_F64LE,        AV_SAMPLE_FMT_DBL, pcm_f64le,        "PCM 64-bit floating point little-endian");
 -PCM_DECODER(PCM_LXF,          AV_SAMPLE_FMT_S32P, pcm_lxf,          "PCM signed 20-bit little-endian planar");
 -PCM_CODEC  (PCM_MULAW,        AV_SAMPLE_FMT_S16, pcm_mulaw,        "PCM mu-law");
++PCM_DECODER(PCM_LXF,          AV_SAMPLE_FMT_S32P,pcm_lxf,          "PCM signed 20-bit little-endian planar");
++PCM_CODEC  (PCM_MULAW,        AV_SAMPLE_FMT_S16, pcm_mulaw,        "PCM mu-law / G.711 mu-law");
+ PCM_CODEC  (PCM_S8,           AV_SAMPLE_FMT_U8,  pcm_s8,           "PCM signed 8-bit");
+ PCM_CODEC  (PCM_S16BE,        AV_SAMPLE_FMT_S16, pcm_s16be,        "PCM signed 16-bit big-endian");
+ PCM_CODEC  (PCM_S16LE,        AV_SAMPLE_FMT_S16, pcm_s16le,        "PCM signed 16-bit little-endian");
 -PCM_DECODER(PCM_S16LE_PLANAR, AV_SAMPLE_FMT_S16, pcm_s16le_planar, "PCM 16-bit little-endian planar");
++PCM_DECODER(PCM_S16LE_PLANAR, AV_SAMPLE_FMT_S16P,pcm_s16le_planar, "PCM 16-bit little-endian planar");
+ PCM_CODEC  (PCM_S24BE,        AV_SAMPLE_FMT_S32, pcm_s24be,        "PCM signed 24-bit big-endian");
+ PCM_CODEC  (PCM_S24DAUD,      AV_SAMPLE_FMT_S16, pcm_s24daud,      "PCM D-Cinema audio signed 24-bit");
+ PCM_CODEC  (PCM_S24LE,        AV_SAMPLE_FMT_S32, pcm_s24le,        "PCM signed 24-bit little-endian");
+ PCM_CODEC  (PCM_S32BE,        AV_SAMPLE_FMT_S32, pcm_s32be,        "PCM signed 32-bit big-endian");
+ PCM_CODEC  (PCM_S32LE,        AV_SAMPLE_FMT_S32, pcm_s32le,        "PCM signed 32-bit little-endian");
+ PCM_CODEC  (PCM_U8,           AV_SAMPLE_FMT_U8,  pcm_u8,           "PCM unsigned 8-bit");
+ PCM_CODEC  (PCM_U16BE,        AV_SAMPLE_FMT_S16, pcm_u16be,        "PCM unsigned 16-bit big-endian");
+ PCM_CODEC  (PCM_U16LE,        AV_SAMPLE_FMT_S16, pcm_u16le,        "PCM unsigned 16-bit little-endian");
+ PCM_CODEC  (PCM_U24BE,        AV_SAMPLE_FMT_S32, pcm_u24be,        "PCM unsigned 24-bit big-endian");
+ PCM_CODEC  (PCM_U24LE,        AV_SAMPLE_FMT_S32, pcm_u24le,        "PCM unsigned 24-bit little-endian");
+ PCM_CODEC  (PCM_U32BE,        AV_SAMPLE_FMT_S32, pcm_u32be,        "PCM unsigned 32-bit big-endian");
+ PCM_CODEC  (PCM_U32LE,        AV_SAMPLE_FMT_S32, pcm_u32le,        "PCM unsigned 32-bit little-endian");
+ PCM_DECODER(PCM_ZORK,         AV_SAMPLE_FMT_U8,  pcm_zork,         "PCM Zork");
 +