diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-24 23:44:56 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-24 23:45:09 +0200 |
| commit | 8f899545502c287653223ca27522c4abcd3a2e91 (patch) | |
| tree | 1b633d81c6104786d65ef05c6da1426bbead30e1 /libavdevice/v4l2.c | |
| parent | fe5bc46f60c0ebd82593999520ebff1d230b0483 (diff) | |
| parent | 8c4022aceb68558df655059cef4d570625dc1d09 (diff) | |
| download | ffmpeg-8f899545502c287653223ca27522c4abcd3a2e91.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avconv: fix a segfault on -c copy with -filter_complex.
isom: Support more DTS codec identifiers.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/v4l2.c')
0 files changed, 0 insertions, 0 deletions