1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
FFmpeg/tests/ref
Michael Niedermayer 4121148388 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  avconv: make -frames work for all types of streams, not just video.
  bfi: K&R cosmetics
  bgmc: K&R cleanup
  rawdec: Set start_time to 0 for raw audio files.
  Detect 'yuv2' as rawvideo also in avi.
  rawdec: propagate pict_type information to the output frame
  rawdec: Support more QT 1bpp rawvideo files.
  avconv: free bitstream filters
  threads: limit the number of automatic threads to MAX_AUTO_THREADS
  avplay: K&R cleanup
  fate: use rgb24 as output format for dfa tests
  threads: set thread_count to 1 when thread support is disabled
  threads: introduce CODEC_CAP_AUTO_THREADS and add it to libx264

Conflicts:
	ffplay.c
	libavcodec/avcodec.h
	libavcodec/pthread.c
	libavcodec/version.h
	tests/ref/fate/dfa1
	tests/ref/fate/dfa10
	tests/ref/fate/dfa11
	tests/ref/fate/dfa2
	tests/ref/fate/dfa3
	tests/ref/fate/dfa4
	tests/ref/fate/dfa5
	tests/ref/fate/dfa6
	tests/ref/fate/dfa7
	tests/ref/fate/dfa8
	tests/ref/fate/dfa9

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-02 03:10:30 +01:00
..
acodec movenc: disable iods by default 2011-12-16 03:50:19 +01:00
fate Merge remote-tracking branch 'qatar/master' 2012-01-02 03:10:30 +01:00
lavf lavf-regression: minimal metadata test. 2011-12-12 20:51:29 +01:00
lavfi Merge remote-tracking branch 'qatar/master' 2011-12-21 03:40:53 +01:00
seek mxfdec: Hybrid demuxing/seeking solution 2011-12-16 11:54:03 +01:00
vsynth1 cljrdec: improve scaling somewhat 2011-12-28 22:05:24 +01:00
vsynth2 cljrdec: improve scaling somewhat 2011-12-28 22:05:24 +01:00