• 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
flac_parser.c 26.6 KB