diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-07 03:59:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-07 03:59:18 +0100 |
| commit | f1f06710c4378029935d155ecd08fa3f38d6fece (patch) | |
| tree | 08680370dafe502932c9d120690489b4621d8e7e /libavdevice/dshow_common.c | |
| parent | 993c2a256dd9bda240883f629b468675644b706c (diff) | |
| parent | 460b9482834e248fa5861d2d88bf9f19ec313d68 (diff) | |
| download | ffmpeg-f1f06710c4378029935d155ecd08fa3f38d6fece.tar.gz | |
Merge remote-tracking branch 'qatar/release/9' into release/1.1
* qatar/release/9:
arm: hpeldsp: prevent overreads in armv6 asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/dshow_common.c')
0 files changed, 0 insertions, 0 deletions