summaryrefslogtreecommitdiffstats
path: root/libavcodec/qsvdec.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '72b7441a10f578a1d0be7083d8f5adf6a01921c2'Michael Niedermayer2015-03-281-9/+1
|\ | | | | | | | | | | | | | | | | | | | | * commit '72b7441a10f578a1d0be7083d8f5adf6a01921c2': lavc: add Intel libmfx-based H.264 encoder Conflicts: Changelog libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: add Intel libmfx-based H.264 encoderAnton Khirnov2015-03-271-9/+1
| |
* | Merge commit '9ba27c2348d26000257e891e40a72facb0d916be'Michael Niedermayer2015-03-281-2/+2
|\ \ | |/ | | | | | | | | | | * commit '9ba27c2348d26000257e891e40a72facb0d916be': qsvdec: add 'decode' to the non-static function names Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * qsvdec: add 'decode' to the non-static function namesAnton Khirnov2015-03-271-2/+2
| |
* | Merge commit 'd0a63d8b989647ffdb5f40da8e1feaffe1a8e791'Michael Niedermayer2015-03-281-10/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | * 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>
| * qsvdec: split off some code that will be shared with the encoderAnton Khirnov2015-03-271-10/+0
| |
* | Merge commit 'b04d009b0e1a34b717f3d3bbf407aef0c742aff1'Michael Niedermayer2015-03-281-5/+5
|/ | | | | | | | | | * commit 'b04d009b0e1a34b717f3d3bbf407aef0c742aff1': qsv: rename to qsvdec Conflicts: libavcodec/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
* qsv: rename to qsvdecAnton Khirnov2015-03-271-0/+86
This is to avoid conflicts with the upcoming QSV encoding support.
OpenPOWER on IntegriCloud