1. 02 Nov, 2012 5 commits
    • Michael Niedermayer's avatar
      Merge commit '50a65e7a' · 67883502
      Michael Niedermayer authored
      * commit '50a65e7a': (24 commits)
        vmdaudio: set channel layout
        twinvq: validate sample rate code
        twinvq: set channel layout
        twinvq: validate that channels is not <= 0
        truespeech: set channel layout
        sipr: set channel layout
        shorten: validate that the channel count in the header is not <= 0
        ra288dec: set channel layout
        ra144dec: set channel layout
        qdm2: remove unneeded checks for channel count
        qdm2: make sure channels is not <= 0 and set channel layout
        qcelpdec: set channel layout
        nellymoserdec: set channels to 1
        libopencore-amr: set channel layout for amr-nb or if not set by the user
        libilbc: set channel layout
        dpcm: use AVCodecContext.channels instead of keeping a private copy
        imc: set channels to 1 instead of validating it
        gsmdec: always set channel layout and sample rate at initialization
        libgsmdec: always set channel layout and sample rate at initialization
        g726dec: do not validate sample rate
        ...
      
      Conflicts:
      	libavcodec/dpcm.c
      	libavcodec/qdm2.c
      Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      67883502
    • Michael Niedermayer's avatar
    • 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
    • Jason's avatar
      Add QT CC track mux support · a5f6720f
      Jason authored
      Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      a5f6720f
    • Michael Niedermayer's avatar
      ebfc212b
  2. 01 Nov, 2012 35 commits