diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-14 13:50:03 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-14 13:50:08 +0100 |
| commit | 7d3e2176231716e6ebddb3ae406245d500979ea8 (patch) | |
| tree | bf155cae9debeda16a9c4d8b3b3c6cb1dd80f907 /libavdevice/libdc1394.c | |
| parent | 2ac6b573a4083e5b840f3577a063237ae0088401 (diff) | |
| parent | 5310da7e83ec9f149dac4c2c5a64e1a24951259e (diff) | |
| download | ffmpeg-7d3e2176231716e6ebddb3ae406245d500979ea8.tar.gz | |
Merge remote-tracking branch 'qatar/release/9' into release/1.1
* qatar/release/9:
arm: Fall back to runtime cpu feature detection via /proc/cpuinfo
doc/platform: Fix 10l typo
xxan: properly handle odd heights.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/libdc1394.c')
0 files changed, 0 insertions, 0 deletions