diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-26 00:51:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-26 00:59:57 +0200 |
| commit | bb619f41bea81e6ee9e208476a92fced4107a853 (patch) | |
| tree | 5e23cf927a92de08b274de40a236d5ef7ea7172e /ffmpeg_dxva2.c | |
| parent | 9f4bff834c47d2093ae35215c4aafa92c29d9d79 (diff) | |
| parent | bf52f773913cf74bdf0d2c8c2cb4473fa1b7801e (diff) | |
| download | ffmpeg-bb619f41bea81e6ee9e208476a92fced4107a853.tar.gz | |
Merge commit 'bf52f773913cf74bdf0d2c8c2cb4473fa1b7801e'
* commit 'bf52f773913cf74bdf0d2c8c2cb4473fa1b7801e':
lavc: add Intel libmfx-based MPEG2 decoder.
Conflicts:
configure
libavcodec/qsvdec_mpeg2.c
Some cosmetics merged, rest is related to the removed parser code and
thus not merged
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'ffmpeg_dxva2.c')
0 files changed, 0 insertions, 0 deletions