Michael Niedermayer
0a731e4596
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>
2015-03-28 01:33:27 +01:00
Michael Niedermayer
d985976e54
Merge commit '9ba27c2348d26000257e891e40a72facb0d916be'
...
* commit '9ba27c2348d26000257e891e40a72facb0d916be':
qsvdec: add 'decode' to the non-static function names
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-28 01:25:20 +01:00
Michael Niedermayer
b12eacb383
Merge commit 'd0a63d8b989647ffdb5f40da8e1feaffe1a8e791'
...
* commit 'd0a63d8b989647ffdb5f40da8e1feaffe1a8e791':
qsvdec: split off some code that will be shared with the encoder
Conflicts:
libavcodec/Makefile
libavcodec/qsvdec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-28 01:16:21 +01:00
Michael Niedermayer
151ae8ea5b
Merge commit 'b04d009b0e1a34b717f3d3bbf407aef0c742aff1'
...
* commit 'b04d009b0e1a34b717f3d3bbf407aef0c742aff1':
qsv: rename to qsvdec
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-28 01:03:23 +01:00
Anton Khirnov
72b7441a10
lavc: add Intel libmfx-based H.264 encoder
2015-03-27 22:02:10 +01:00
Anton Khirnov
9ba27c2348
qsvdec: add 'decode' to the non-static function names
2015-03-27 21:57:47 +01:00
Anton Khirnov
d0a63d8b98
qsvdec: split off some code that will be shared with the encoder
2015-03-27 21:57:28 +01:00
Anton Khirnov
b04d009b0e
qsv: rename to qsvdec
...
This is to avoid conflicts with the upcoming QSV encoding support.
2015-03-27 21:56:36 +01:00
