Michael Niedermayer 215db2935b Merge commit 'b263f8ffe7599d9cd27ec477a12700da8eb2790d' ... * commit 'b263f8ffe7599d9cd27ec477a12700da8eb2790d': lavf: add AVFormatContext.max_ts_probe Conflicts: doc/APIchanges libavformat/avformat.h libavformat/utils.c libavformat/version.h lavf-fate/mp3 changes as the estimated input bitrate changes and that is copied to the output Merged-by: Michael Niedermayer <michaelni@gmx.at>		2014-08-25 13:25:09 +02:00
..
fate	avfilter: add codecview filter	2014-08-24 14:35:11 +02:00
filtergraphs
ref	Merge commit 'b263f8ffe7599d9cd27ec477a12700da8eb2790d'	2014-08-25 13:25:09 +02:00
audiogen.c	Merge commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867'	2014-08-15 21:26:12 +02:00
base64.c
copycooker.sh
fate-run.sh	Merge commit '706208ef47bffd525c982975d2756f7b2b220b8d'	2014-08-01 15:03:22 +02:00
fate-valgrind.supp
fate.sh	tests/fate.sh: If cat *.rep fails try it with a for loop.	2014-07-28 18:34:16 +02:00
ffserver-regression.sh
ffserver.conf	ffserver: tests, use Metadata title in config	2014-08-24 20:03:22 -04:00
ffserver.regression.ref
lavf-regression.sh	fate: Add test for wav Peak Envelope Chunk encoder (levl chunk).	2014-07-18 19:38:54 +02:00
lena.pnm
Makefile	fate: Fix ffprobe tests with --target-path set.	2014-08-24 03:04:23 +02:00
md5.sh
regression-funcs.sh
rotozoom.c
test.ffmeta
tiny_psnr.c
tiny_ssim.c
utils.c
videogen.c