diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-01 02:05:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-01 02:08:19 +0200 |
| commit | 9e3c8f61feb2463c06aab4dad60de08dbee9d891 (patch) | |
| tree | 473b7ab2b5474ca27557066087038d9bfee4ea15 /libavcodec/arm/vp8dsp_armv6.S | |
| parent | d56c373391d334d3dc29c752955fd17f0cef7ff9 (diff) | |
| parent | 678e455f1dc09265464b13d936d9fda62bc2bf43 (diff) | |
| download | ffmpeg-9e3c8f61feb2463c06aab4dad60de08dbee9d891.tar.gz | |
Merge commit '678e455f1dc09265464b13d936d9fda62bc2bf43'
* commit '678e455f1dc09265464b13d936d9fda62bc2bf43':
dxva2: Directly use AVFrames
Conflicts:
libavcodec/dxva2_h264.c
See: 29be9b5301212d29186a05f262a6ce04ddbc168c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/vp8dsp_armv6.S')
0 files changed, 0 insertions, 0 deletions