1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
FFmpeg/tests/ref
Michael Niedermayer 1d186e9e12 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>
2011-08-02 22:12:18 +02:00
..
acodec
fate Merge remote-tracking branch 'qatar/master' 2011-08-02 22:12:18 +02:00
lavf Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
lavfi Revert "swscale: use 15-bit intermediates for 9/10-bit scaling." 2011-08-02 12:27:43 -07:00
seek Merge remote-tracking branch 'qatar/master' 2011-07-09 02:06:40 +02:00
vsynth1 Merge remote-tracking branch 'qatar/master' 2011-07-22 12:08:52 +02:00
vsynth2 Merge remote-tracking branch 'qatar/master' 2011-07-22 12:08:52 +02:00