Michael Niedermayer f9fd6f983b Merge commit '2eba9087f3031c6050f8dcd996225490be6c2410' ...

* commit '2eba9087f3031c6050f8dcd996225490be6c2410':
  lavc: make up a fake frame channel layout when there is no real one.

Conflicts:
	libavcodec/utils.c

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

2013-03-12 12:49:59 +01:00

..

acodec

lswr: Improve default resampler's default parameters

2013-01-04 16:47:57 +01:00

fate

Merge commit '2eba9087f3031c6050f8dcd996225490be6c2410'

2013-03-12 12:49:59 +01:00

lavf

movenc: hotfix, dont store fiel for h264 / mpeg4-asp / dnxhd

2013-02-14 17:48:08 +01:00

lavf-fate

mp3dec: Fix VBR bit rate parsing

2013-03-05 13:06:01 +01:00

lavfi

tests: add overlay rgb and yuv444 tests

2013-03-05 13:20:13 +01:00

seek

ff_gen_search: Fix finding the maximum timestamp in a really small file

2013-02-18 20:37:17 +01:00

vsynth

movenc: hotfix, dont store fiel for h264 / mpeg4-asp / dnxhd

2013-02-14 17:48:08 +01:00

vsynth1

Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725'

2012-05-30 01:40:54 +02:00

vsynth2

Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725'

2012-05-30 01:40:54 +02:00