diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-28 01:33:27 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-28 01:33:27 +0100 |
| commit | 0a731e45964cda0606fc04128f41353d8282f091 (patch) | |
| tree | 652c5ac32280da901becae1c152ea73012bab921 /libavdevice/dshow_pin.c | |
| parent | d985976e54aec274d0c261091f77559d1a1bef84 (diff) | |
| parent | 72b7441a10f578a1d0be7083d8f5adf6a01921c2 (diff) | |
| download | ffmpeg-0a731e45964cda0606fc04128f41353d8282f091.tar.gz | |
Merge commit '72b7441a10f578a1d0be7083d8f5adf6a01921c2'
* commit '72b7441a10f578a1d0be7083d8f5adf6a01921c2':
lavc: add Intel libmfx-based H.264 encoder
Conflicts:
Changelog
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/dshow_pin.c')
0 files changed, 0 insertions, 0 deletions