1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
FFmpeg/tests/ref
Michael Niedermayer 721be99371 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  cosmetics: fix some then/than typos
  doxygen: Include libavcodec and libavformat examples into the documentation
  avutil: elaborate documentation for av_get_random_seed
  Add support for aac streams in mp4/mov without extradata.
  aes: whitespace cosmetics
  adler32: whitespace cosmetics
  swscale: fix another yuv range conversion overflow in 16bit scaling.
  Fix cpu flags test program
  opt-test: Add missing braces to silence compiler warnings.
  build: Eliminate obsolete test targets.
  udp: Fix a compilation warning
  swscale: Unbreak build with --enable-small
  base64: add fate test
  aes: improve test program and add fate test
  adler32: make test program more useful and add fate test
  swscale: fix yuv range correction when using 16-bit scaling.
  aacenc: Make chan_map const correct

Conflicts:
	Makefile
	doc/examples/muxing-example.c
	libavformat/udp.c
	libavutil/random_seed.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-01 05:35:26 +02:00
..
acodec Merge remote-tracking branch 'qatar/master' 2011-05-19 06:00:31 +02:00
fate Merge remote-tracking branch 'qatar/master' 2011-07-01 05:35:26 +02:00
lavf swscale: fix JPEG-range YUV scaling artifacts. 2011-06-14 09:46:49 -04:00
lavfi swscale: implement >8bit scaling support. 2011-06-29 09:45:52 -07:00
seek lavf/utils: fix ff_interleave_compare_dts corner case. 2011-05-10 07:53:19 -04:00
vsynth1 error_resilience: actually add counter when adding a MV predictor. 2011-06-20 22:18:23 +02:00
vsynth2 error_resilience: actually add counter when adding a MV predictor. 2011-06-20 22:18:23 +02:00