Michael Niedermayer 8334850a99 Merge commit '93afb6c98df876b15e3d911a9450ad55f92080ce' ...

* commit '93afb6c98df876b15e3d911a9450ad55f92080ce':
  avconv: set output avg_frame_rate when known

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-05-18 14:38:36 +02:00

..

fate

Merge commit '4735784f1ced27026fbeada5fd31505132e565e9'

2014-05-16 21:22:25 +02:00

filtergraphs

…

ref

Merge commit '93afb6c98df876b15e3d911a9450ad55f92080ce'

2014-05-18 14:38:36 +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

…

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

…

tiny_ssim.c

tests/tiny_ssim: more correct error message

2014-05-05 19:00:14 +02:00

utils.c

…

videogen.c

…