Michael Niedermayer eacf7d650d Merge commit '0c1959b056f6ccaa2eee2c824352ba93c8e36d52' ... * commit '0c1959b056f6ccaa2eee2c824352ba93c8e36d52': lavf: add AVFMT_FLAG_BITEXACT. Conflicts: doc/APIchanges libavformat/avformat.h libavformat/flacenc.c libavformat/movenc.c libavformat/oggenc.c libavformat/options_table.h libavformat/version.h tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>		2014-05-15 19:16:57 +02:00
..
fate	Merge commit '0c1959b056f6ccaa2eee2c824352ba93c8e36d52'	2014-05-15 19:16:57 +02:00
filtergraphs	Merge remote-tracking branch 'qatar/master'	2014-03-16 14:32:47 +01:00
ref	Initialize riff and wav size fields to -1 instead of 0.	2014-05-03 22:21:00 +02:00
audiogen.c
base64.c
copycooker.sh
fate-run.sh	Merge commit '0c1959b056f6ccaa2eee2c824352ba93c8e36d52'	2014-05-15 19:16:57 +02:00
fate-update.sh
fate-valgrind.supp
fate.sh	tests/fate: fix fate on branches different from origin/master	2013-10-29 21:53:59 +01:00
ffserver-regression.sh
ffserver.conf
ffserver.regression.ref
lavf-regression.sh	Merge commit '60fd7d36c47d62d4c603bf16c213b1a924f5cfcf'	2014-04-09 13:58:55 +02:00
lena.pnm
Makefile	Merge commit 'b70d7a4ac72d23f3448f3b08b770fdf5f57de222'	2014-05-15 18:20:17 +02:00
md5.sh
regression-funcs.sh	Merge commit '0c1959b056f6ccaa2eee2c824352ba93c8e36d52'	2014-05-15 19:16:57 +02:00
rotozoom.c
test.ffmeta
tiny_psnr.c	tests/tiny_psnr: Print information about the supported sample types in the help and error texts	2014-03-24 04:02:51 +01:00
tiny_ssim.c	tests/tiny_ssim: more correct error message	2014-05-05 19:00:14 +02:00
utils.c
videogen.c