diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 12:41:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 12:49:59 +0100 |
| commit | f9fd6f983b979b2da0f9bba3d6b150a302deb1fe (patch) | |
| tree | 6e1f91b358394778f798a4d32b22f8317d93a06e /libavdevice/lavfi.c | |
| parent | a7f9d92a6d54495f812317abe249582c66efb7b6 (diff) | |
| parent | 2eba9087f3031c6050f8dcd996225490be6c2410 (diff) | |
| download | ffmpeg-streaming-f9fd6f983b979b2da0f9bba3d6b150a302deb1fe.zip ffmpeg-streaming-f9fd6f983b979b2da0f9bba3d6b150a302deb1fe.tar.gz | |
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>
Diffstat (limited to 'libavdevice/lavfi.c')
0 files changed, 0 insertions, 0 deletions
