Michael Niedermayer 35ce42e070 Merge commit '8b8899ac3233b4f7af83ded0dc032fad8902d714' ...

* commit '8b8899ac3233b4f7af83ded0dc032fad8902d714':
  fate: Declare avcodec/avformat deps in the respective Makefile snippets
  fate: Add dependencies for WMA and WavPack tests
  Improve wording and spelling of av_log_missing_feature messages.
  lavu: remove disabled FF_API_AV_FIFO_PEEK cruft

Conflicts:
	libavcodec/aacsbr.c
	libavutil/version.h

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

2012-10-23 15:00:27 +02:00

..

fate

Merge commit '8b8899ac3233b4f7af83ded0dc032fad8902d714'

2012-10-23 15:00:27 +02:00

ref

fate/mapchan: add bitexact flag

2012-10-23 02:19:38 +02:00

asynth1.sw

…

audiogen.c

Merge remote-tracking branch 'qatar/master'

2012-07-29 02:16:26 +02:00

base64.c

…

copycooker.sh

…

fate-run.sh

Merge remote-tracking branch 'qatar/master'

2012-07-09 22:40:12 +02:00

fate-update.sh

…

fate-valgrind.supp

…

fate.sh

Merge remote-tracking branch 'qatar/master'

2012-09-06 16:23:17 +02:00

ffserver-regression.sh

…

ffserver.conf

…

ffserver.regression.ref

…

lavf-regression.sh

fate: add faststart regression test.

2012-09-27 08:59:37 +02:00

lavfi-regression.sh

fate: add vf_idet filter to lavfi regression tests

2012-10-11 02:21:28 +02:00

lena.pnm

…

Makefile

Merge commit '8b8899ac3233b4f7af83ded0dc032fad8902d714'

2012-10-23 15:00:27 +02:00

md5.sh

Merge commit '3dc06b6972cf389269e9c36ff0a4373f80f7149b'

2012-10-16 14:04:14 +02:00

regression-funcs.sh

…

rotozoom.c

Merge remote-tracking branch 'qatar/master'

2012-06-07 21:45:52 +02:00

test.ffmeta

fate/ffprobe: add some stream metadata.

2012-10-08 11:03:27 +02:00

tiny_psnr.c

Merge commit '3dc06b6972cf389269e9c36ff0a4373f80f7149b'

2012-10-16 14:04:14 +02:00

utils.c

…

videogen.c

Merge remote-tracking branch 'qatar/master'

2012-06-07 21:45:52 +02:00