Michael Niedermayer de2cfb744a Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  pcmenc: set correct bitrate value
  avprobe: don't print format entry name when only one was requested

Conflicts:
	ffprobe.c

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

2012-05-17 23:45:00 +02:00

..

fate

Merge remote-tracking branch 'qatar/master'

2012-05-17 23:45:00 +02:00

ref

Merge remote-tracking branch 'qatar/master'

2012-05-17 23:45:00 +02:00

asynth1.sw

movenc: Decrease default chunk merge limit to 1mb.

2012-01-23 23:41:32 +01:00

audiogen.c

Merge remote-tracking branch 'qatar/master'

2012-04-20 22:18:26 +02:00

base64.c

…

codec-regression.sh

Get rid of tests/data/asynth-%.sw rule.

2012-04-23 23:26:05 +02:00

copycooker.sh

…

fate_config.sh.template

…

fate-run.sh

Merge remote-tracking branch 'qatar/master'

2012-05-16 22:32:05 +02:00

fate-update.sh

…

fate-valgrind.supp

Add a --valgrind configure option.

2012-01-21 12:04:46 +01:00

fate.sh

fate: add support for specifying the shell used to run configure

2012-01-30 20:35:09 +01:00

ffserver-regression.sh

…

ffserver.conf

…

ffserver.regression.ref

…

lavf-regression.sh

Merge remote-tracking branch 'qatar/master'

2012-05-16 22:32:05 +02:00

lavfi-regression.sh

Merge remote-tracking branch 'qatar/master'

2012-04-14 22:37:43 +02:00

lena.pnm

…

Makefile

ffmpeg: add support for audio filters.

2012-05-17 03:29:21 +02:00

md5.sh

…

regression-funcs.sh

Merge remote-tracking branch 'qatar/master'

2012-05-16 22:32:05 +02:00

rotozoom.c

Merge remote-tracking branch 'qatar/master'

2012-05-05 20:22:09 +02:00

tiny_psnr.c

tiny_psnr: reindent after last commit.

2012-04-15 15:46:46 +02:00

utils.c

Merge remote-tracking branch 'qatar/master'

2012-05-06 21:53:19 +02:00

videogen.c

Merge remote-tracking branch 'qatar/master'

2012-05-05 20:22:09 +02:00