Michael Niedermayer
fbdbe7a5d2
Merge commit 'ecee1148af4989e1f9e16f0cdc9f98ad2045538c'
...
* commit 'ecee1148af4989e1f9e16f0cdc9f98ad2045538c':
qsvenc_hevc: use the correct HW plugin UID
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-22 16:46:25 +02:00
Anton Khirnov
ecee1148af
qsvenc_hevc: use the correct HW plugin UID
2015-07-22 12:11:46 +02:00
Michael Niedermayer
7ee935ba5c
avcodec/qsvenc_hevc: Attempt to fix error: too few arguments to function ff_hevc_extract_rbsp
...
Found-by: Ivan Uskov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-09 16:51:51 +02:00
Michael Niedermayer
7871eb4361
Merge commit '66acb76bb0492b263215ca9b4d927a7be39ace02'
...
* commit '66acb76bb0492b263215ca9b4d927a7be39ace02':
lavc: add Intel libmfx-based HEVC encoder
Conflicts:
Changelog
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/qsv.c
libavcodec/qsvenc.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-09 11:53:14 +02:00
Anton Khirnov
66acb76bb0
lavc: add Intel libmfx-based HEVC encoder
2015-07-08 23:40:11 +02:00