diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-15 20:41:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-15 20:41:08 +0100 |
| commit | 6391dec82a975d9a170773eacb80f1b7b05b7400 (patch) | |
| tree | 2c8480a1bda99387545c9b3bd34398664c49a3e0 /ffmpeg_opt.c | |
| parent | 221dc52d03e113bd394ea3c6746d4b5506bd7dd1 (diff) | |
| parent | aab40bbfd5a7df1489500656a95448a0c53c1bd5 (diff) | |
| download | ffmpeg-6391dec82a975d9a170773eacb80f1b7b05b7400.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: dsputil: Simplify xvmc deprecation conditional
Conflicts:
libavcodec/x86/dsputil_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
0 files changed, 0 insertions, 0 deletions