1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
FFmpeg/libavcodec
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
..
2013-02-21 23:06:30 +01:00
2013-03-06 22:11:46 +01:00
2013-03-06 22:11:46 +01:00
2013-03-06 22:11:46 +01:00
2013-03-06 22:11:46 +01:00
2013-03-06 22:11:46 +01:00
2013-03-06 22:11:46 +01:00
2013-03-06 22:11:46 +01:00
2013-03-06 10:31:56 +00:00
2013-03-02 20:39:38 +01:00
2013-03-05 03:29:04 +01:00
2013-03-12 12:17:58 +01:00
2013-03-06 22:11:46 +01:00
2013-03-12 10:35:51 +01:00
2013-03-06 22:11:46 +01:00