Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Aug 2011 20:07:51 +0000 (22:07 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Aug 2011 20:12:18 +0000 (22:12 +0200)
commit1d186e9e120d777cc9f5e68d2974d48bfbdd528e
tree571e05f6a9ba06c10729f67ccd29353c2b31aa19
parent03cbe6c8bc42626107e75b001180b81781619ed7
parent62ee0e6a977e1990c9853630c7dea1415b38bb28
Merge remote-tracking branch 'qatar/master'

* 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: Michael Niedermayer <michaelni@gmx.at>
13 files changed:
doc/APIchanges
libavcodec/aacdec.c
libavcodec/avcodec.h
libavcodec/bink.c
libavcodec/rv34.c
libavcodec/version.h
libavcodec/x86/dct32_sse.asm
libavcodec/x86/fft.c
libavcodec/x86/fft.h
libavformat/avformat.h
libavformat/mpegts.c
libavformat/options.c
libavformat/utils.c