[FFmpeg-cvslog] Merge commit '5ac673b5531d846b79a3d77e3e932e0cb1234c45'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Oct 23 12:36:16 2012 +0200| [dcb0d1193a3de3711bdb410c1fe3f70cc5143603] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dcb0d1193a3de3711bdb410c1fe3f70cc5143603
---