* 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>
* 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>