• Michael Niedermayer's avatar
    Merge remote branch 'qatar/master' · f3543969
    Michael Niedermayer authored
    * qatar/master:
      Fixed-point MDCT with 32-bit unscaled output
      lavc: deprecate rate_emu
      lavc: mark hurry_up for removal on next major bump
      parser: mark av_parser_parse() for removal on next major bump
      lavc: add missing audioconvert includes
      jvdec: don't use deprecated CODEC_TYPE_*/PKT_FLAG_KEY
    
    Conflicts:
    	libavcodec/h264.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    f3543969
h263dec.c 25.3 KB