From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Wed, 12 Jun 2013 11:02:19 +0000 (+0200)
Subject: Update NEWS, LIST, POTFILES and minor change for QSV.
X-Git-Tag: 2.1.0-git~135
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=5e6a5d353004a9cbcceef56f0d3db6d67c0def15;p=vlc

Update NEWS, LIST, POTFILES and minor change for QSV.
---

diff --git a/NEWS b/NEWS
index 70df8be846..a9b9feeaf3 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 aed6b5bcfe..5c347f8156 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 cf664a346a..4ba759e97a 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 30e4fa2fa9..7be675c4f2 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 3ecf1c4064..0551343aee 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