diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-29 00:48:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-29 00:52:05 +0200 |
| commit | 0f630b7b1244e7fab3dc66c3fb396186f7c09065 (patch) | |
| tree | 85b064956994f96d05c098d1eb253dc2b7ebeb2e /tools/aviocat.c | |
| parent | 2548f8a237b1ef85d1b56a897e93d5af206e4654 (diff) | |
| parent | ed4b757177f9b563412cdbc8ee3405d82e10fc05 (diff) | |
| download | ffmpeg-0f630b7b1244e7fab3dc66c3fb396186f7c09065.tar.gz | |
Merge commit 'ed4b757177f9b563412cdbc8ee3405d82e10fc05'
* commit 'ed4b757177f9b563412cdbc8ee3405d82e10fc05':
dxva2_h264: add a workaround for old Intel GPUs
Conflicts:
doc/APIchanges
libavcodec/version.h
See: 8b2a130d3fe61e348092714dffa425b63c4d796c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools/aviocat.c')
0 files changed, 0 insertions, 0 deletions