Michael Niedermayer bb5657fabf Merge commit '6072184e702b4b631ac72f1b66b75e5f21e0ce2d' ...

* commit '6072184e702b4b631ac72f1b66b75e5f21e0ce2d':
  asfenc: use codec descriptors instead of AVCodecs to write codec info

Conflicts:
	tests/ref/lavf/asf
	tests/ref/seek/lavf-asf

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

2014-05-01 17:40:14 +02:00

..

fate

fate/hevc: update with new sequences from jctvc(cherry picked from commit de6d9c586bd3852dfbe629a88ccc8c0f0a2bfcbb)

2014-04-30 21:51:58 +02:00

filtergraphs

Merge remote-tracking branch 'qatar/master'

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

ref

Merge commit '6072184e702b4b631ac72f1b66b75e5f21e0ce2d'

2014-05-01 17:40:14 +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

Fix TARGET_SAMPLES and TARGET_PATH for some fate tests.

2014-03-18 01:29:50 +01: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

Fix TARGET_SAMPLES and TARGET_PATH for some fate tests.

2014-03-18 01:29:50 +01:00

md5.sh

…

regression-funcs.sh

Fix TARGET_SAMPLES and TARGET_PATH for some fate tests.

2014-03-18 01:29:50 +01: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: drop isatty() support

2014-02-21 17:29:58 +01:00

utils.c

…

videogen.c

…