• Michael Niedermayer's avatar
    Merge commit '5ac673b5' · dcb0d119
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    dcb0d119
options_table.h 43.9 KB