Merge commit '2eba9087f3031c6050f8dcd996225490be6c2410'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Mar 2013 11:41:16 +0000 (12:41 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Mar 2013 11:49:59 +0000 (12:49 +0100)
commitf9fd6f983b979b2da0f9bba3d6b150a302deb1fe
tree6e1f91b358394778f798a4d32b22f8317d93a06e
parenta7f9d92a6d54495f812317abe249582c66efb7b6
parent2eba9087f3031c6050f8dcd996225490be6c2410
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>
libavcodec/internal.h
libavcodec/utils.c
tests/ref/fate/ffprobe_compact
tests/ref/fate/ffprobe_csv
tests/ref/fate/ffprobe_default
tests/ref/fate/ffprobe_flat
tests/ref/fate/ffprobe_ini
tests/ref/fate/ffprobe_json
tests/ref/fate/ffprobe_xml