diff --git a/NEWS b/NEWS index 70df8be846b0304e76cb609b74b005e93044ed16..a9b9feeaf3e786c01dbf135640bff0097e4925bb 100644 --- a/NEWS +++ b/NEWS @@ -36,6 +36,7 @@ Decoders: Encoders: * high10, high422 and high444 encoding support in h264 + * QuickSyncVideo Encoding (Intel Media SDK) support using Intel GPU on Windows Access: * Screen: add support for OS X Lion and later, diff --git a/configure.ac b/configure.ac index aed6b5bcfeb1b5c3099003dd6f7ceb2b27d401c5..5c347f81563465c9e5f46a42d46b83a5182646dc 100644 --- a/configure.ac +++ b/configure.ac @@ -2842,7 +2842,7 @@ fi dnl dnl Intel QuickSync (aka MediaSDK) H264/H262 encoder dnl -PKG_ENABLE_MODULES_VLC([QUICKSYNC], [qsv], libmfx, [Intel QuickSync MPEG4-Part10/MPEG2 (aka H.264/H.262) encoder], [auto]) +PKG_ENABLE_MODULES_VLC([QUICKSYNC], [qsv], [libmfx], [Intel QuickSync MPEG4-Part10/MPEG2 (aka H.264/H.262) encoder], [auto]) dnl dnl libfluidsynth (MIDI synthetizer) plugin diff --git a/modules/LIST b/modules/LIST index cf664a346ad95e3756d352868f697f28bb8d3e41..4ba759e97ad714f8d2a1a26167dd7091874c6ea7 100644 --- a/modules/LIST +++ b/modules/LIST @@ -263,6 +263,7 @@ $Id$ * pulsesrc: PulseAudio audio input * puzzle: puzzle video filter * pva: PVA demuxer + * qsv: QuickSyncVideo Encoder for Intel hardware * qt4: interface module using the cross-platform Qt4 library * qtcapture: Quicktime Video Capture * qtsound: Quicktime Audio Capture diff --git a/modules/codec/qsv.c b/modules/codec/qsv.c index 30e4fa2fa941c7a06538c44cfa92918a1cfb2b3a..7be675c4f222d67a78a5616d57394a3a62273ca2 100644 --- a/modules/codec/qsv.c +++ b/modules/codec/qsv.c @@ -259,7 +259,7 @@ typedef struct qsv_frame_pool_t { mfxFrameInfo fmt; // IntelMediaSDK format info. mfxFrameSurface1 *frames; // An allocated array of 'size' frames. - unsigned int size; // The number of frame in the pool. + size_t size; // The number of frame in the pool. } qsv_frame_pool_t; typedef struct async_task_t diff --git a/po/POTFILES.in b/po/POTFILES.in index 3ecf1c40648e6745df2a6939daeeb2bd4d0a9276..0551343aeed0d1c011df13076da5bc7a730a34b7 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -385,6 +385,7 @@ modules/codec/omxil/utils.c modules/codec/omxil/vout.c modules/codec/opus.c modules/codec/png.c +modules/codec/qsv.c modules/codec/quicktime.c modules/codec/rawvideo.c modules/codec/schroedinger.c