• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · ec1ffae0
    Michael Niedermayer authored
    * qatar/master:
      qcelpdec: cosmetics: do not add line break before opening bracket in 'for', 'while', 'if/else', and 'switch' statements.
      qcelp: check output buffer size before decoding
      qcelpdec: fix the return value of qcelp_decode_frame().
      sipr: fix the output data size check and only calculate it once.
      Synchronize various 4CCs and codec tags from FFmpeg.
      qdm2: check output buffer size before decoding
      Fix out of bound reads in the QDM2 decoder.
      Check for out of bound writes in the QDM2 decoder.
      ogg/celt: do not set sample_fmt in the demuxer
    
    Conflicts:
    	libavcodec/avcodec.h
    	libavcodec/qdm2.c
    	libavformat/oggparsecelt.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    ec1ffae0
oggparsecelt.c 3.17 KB