RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-19 05:55:07 +00:00
Code Issues Projects Releases Wiki Activity
47b6b7a2b9
ffmpeg/tests/ref
History
Michael Niedermayer 7c26761b81 Merge commit 'fe1c1198e670242f3cf9e3e1eef27cff77f3ee23' 
* commit 'fe1c1198e670242f3cf9e3e1eef27cff77f3ee23':
  lavf: use dts difference instead of AVPacket.duration in find_stream_info()
  avf: introduce nobuffer option
  fate: make yadif tests consistent across systems
  vf_hqdn3d: support 9 and 10bit colordepth
  vf_hqdn3d: reduce intermediate precision
  vf_hqdn3d: simplify and optimize
  factor identical ff_inplace_start_frame out of two filters
  vf_hqdn3d: cosmetics
  avprobe/avconv: fix tentative declaration compile errors on MSVS.

Conflicts:
	doc/APIchanges
	ffmpeg.c
	ffprobe.c
	libavformat/avformat.h
	libavformat/options_table.h
	libavformat/utils.c
	libavformat/version.h
	tests/fate/filter.mak
	tests/ref/fate/filter-yadif-mode0
	tests/ref/fate/filter-yadif-mode1

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-29 23:04:49 +02:00
..
fate Merge commit 'fe1c1198e670242f3cf9e3e1eef27cff77f3ee23' 2012-07-29 23:04:49 +02:00
lavf Merge remote-tracking branch 'qatar/master' 2012-07-24 21:15:57 +02:00
lavf-fate mp3enc: add lame tag with start padding info 2012-07-14 17:20:22 +02:00
lavfi lavfi: add alphaextract and alphamerge filters 2012-07-22 12:17:34 +02:00
seek lavf: move generic index generation code to a later point 2012-07-26 03:04:49 +02:00
vsynth1 Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725' 2012-05-30 01:40:54 +02:00
vsynth2 Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725' 2012-05-30 01:40:54 +02:00