• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 1d186e9e
    Michael Niedermayer authored
    * qatar/master:
      Revert "swscale: use 15-bit intermediates for 9/10-bit scaling."
      swscale: use 15-bit intermediates for 9/10-bit scaling.
      dct32: Add SSE2 ASM optimizations
      Correct chroma vector calculation for RealVideo 3.
      lavf: Add an option to discard corrupted frames
      mpegts: Mark wrongly-sized packets as corrupted
      mpegts: Move scan test to handle_packets
      mpegts: Mark corrupted packets
      mpegts: Reset continuity counter on seek
      mpegts: Fix for continuity counter
      mpegts: Silence "can't seek" warning on unseekable
      apichange: add an entry for AV_PKT_FLAG_CORRUPT
      avpacket: signal possibly corrupted packets
      mpeg4videodec: remove dead code that would have detected erroneous encoding
      aac: Remove some suspicious illegal memcpy()s from LTP.
      bink: Eliminate unnecessary shadow declaration.
    
    Conflicts:
    	doc/APIchanges
    	libavcodec/version.h
    	libavformat/avformat.h
    	libavformat/options.c
    	libavformat/utils.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    1d186e9e
bink.c 43.5 KB