Merge commit '5ac673b5'
* commit '5ac673b5': 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>
Showing
This diff is collapsed.
Please
register
or
sign in
to comment