Michael Niedermayer ac293b6685 Merge commit '194be1f43ea391eb986732707435176e579265aa' ...

* commit '194be1f43ea391eb986732707435176e579265aa':
  lavf: switch to AVStream.time_base as the hint for the muxer timebase

Conflicts:
	doc/APIchanges
	libavformat/filmstripenc.c
	libavformat/movenc.c
	libavformat/mxfenc.c
	libavformat/oggenc.c
	libavformat/swf.h
	libavformat/version.h
	tests/ref/lavf/mkv

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

2014-06-18 19:49:17 +02:00

..

fate

Remove avserver.

2014-06-18 14:55:28 +02:00

filtergraphs

Merge remote-tracking branch 'qatar/master'

2014-03-16 14:32:47 +01:00

ref

Merge commit '194be1f43ea391eb986732707435176e579265aa'

2014-06-18 19:49:17 +02:00

audiogen.c

Merge remote-tracking branch 'qatar/master'

2013-07-26 11:12:11 +02:00

base64.c

…

copycooker.sh

…

fate-run.sh

Merge commit '0c1959b056f6ccaa2eee2c824352ba93c8e36d52'

2014-05-15 19:16:57 +02:00

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

Remove avserver.

2014-06-18 14:55:28 +02:00

lena.pnm

…

Makefile

tests: add a third, 34x34, target

2014-06-10 20:24:49 +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

tests: allow passing dimensions to videogen

2014-05-29 21:26:48 +02:00