• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 15285d8f
    Michael Niedermayer authored
    * qatar/master: (22 commits)
      arm: remove disabled function dct_unquantize_h263_inter_iwmmxt()
      Remove commented-out call to non-existing function print_pow1().
      Do not decode RV30 files if the extradata is too small
      flashsv: split flashsv_decode_block() off from flashsv_decode_frame().
      ppc: remove disabled code
      libspeexdec: Drop const qualifier to silence compiler warning.
      libopenjpeg: Drop const qualifier to silence compiler warning.
      alac: Remove unused dummy code.
      Remove unused structs and tables.
      vaapi: do not assert on value read from input bitstream
      flashsvenc: replace bitstream description by a link to the specification
      flashsvenc: drop unnecessary cast
      flashsvenc: improve some variable names and fix corresponding comments
      flashsvenc: merge two consecutive if-conditions
      flashsvenc: merge variable declarations and initializations
      flashsvenc: convert some debug av_log() to av_dlog()
      flashsvenc: whitespace cosmetics
      flashsvenc: drop some unnecessary parentheses
      flashsvenc: fix some comment typos
      aacps: skip some memcpy() if src and dst would be equal
      ...
    
    Conflicts:
    	libavcodec/vaapi_mpeg2.c
    	libavformat/aviobuf.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    15285d8f
mpegaudioenc.c 22.6 KB