• Michael Niedermayer's avatar
    Merge commit '8ac0f676' · db9f426c
    Michael Niedermayer authored
    * commit '8ac0f676':
      dcadec: allow the decoder to change the channel layout mid-stream
      cook: use av_dlog() for debug logging instead of av_log() with AV_LOG_ERROR
      cook: move samples_per_frame from COOKSubpacket to where it is used
      cook: use av_get_channel_layout_nb_channels() instead of cook_count_channels()
      cook: reverse a condition so that the code makes more sense
      cook: remove unneeded COOKContext variable, sample_rate
      cook: remove unneeded COOKContext variable, bit_rate
      cook: use AVCodecContext.channels instead of keeping a private copy
      bmvaudio: set channel layout at init() rather than validating it
      atrac1: do not keep a copy of channel count in the private context
      dsicinaudio: set channels and channel layout
      g722dec: set channel layout at initialization instead of validating it
      amrwbdec: set channels, channel_layout, and sample_rate
      amrnbdec: set channels, channel_layout, and sample_rate
      dca_parser: allow the parser to change the sample rate
      lavc: check channel count after decoder init
      lavc: move SANE_NB_CHANNELS to internal.h and use it in the PCM decoders
    
    Conflicts:
    	libavcodec/dcadec.c
    	libavcodec/pcm.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    db9f426c
dca_parser.c 6.4 KB