diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-19 20:52:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-19 21:12:04 +0100 |
| commit | 841e9f431cf4b1be0b5c3932c289d405f34dfcc2 (patch) | |
| tree | 6f7c1159a0ceff4a7287b6f9725dd0fbd4fafc96 /libavresample/avresampleres.rc | |
| parent | 560eb7179a7c46ba277c9c120840816869a47a70 (diff) | |
| parent | 4e08c821106fc1d6d358864abf0d8488b12f38c6 (diff) | |
| download | ffmpeg-841e9f431cf4b1be0b5c3932c289d405f34dfcc2.tar.gz | |
Merge commit '4e08c821106fc1d6d358864abf0d8488b12f38c6'
* commit '4e08c821106fc1d6d358864abf0d8488b12f38c6':
lavc: add an Intel libmfx-based H.264 decoder
Conflicts:
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/avresampleres.rc')
0 files changed, 0 insertions, 0 deletions