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>

1 files changed, 68 insertions, 0 deletions

diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h
new file mode 100644
index 0000000000..9f7f8ccfa5
--- /dev/null
+++ b/libavcodec/qsvenc.h
@@ -0,0 +1,68 @@
+/*
+ * Intel MediaSDK QSV encoder utility functions
+ *
+ * copyright (c) 2013 Yukinori Yamazoe
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_QSVENC_H
+#define AVCODEC_QSVENC_H
+
+#include <stdint.h>
+#include <sys/types.h>
+
+#include <mfx/mfxvideo.h>
+
+#include "libavutil/avutil.h"
+
+#include "avcodec.h"
+#include "qsv_internal.h"
+
+typedef struct QSVEncContext {
+    AVCodecContext *avctx;
+
+    QSVFrame *work_frames;
+
+    mfxSession session;
+    mfxSession internal_session;
+
+    int packet_size;
+
+    mfxVideoParam param;
+    mfxFrameAllocRequest req;
+
+    mfxExtCodingOption  extco;
+    mfxExtBuffer *extparam[1];
+
+    // options set by the caller
+    int async_depth;
+    int idr_interval;
+    int profile;
+    int preset;
+    int avbr_accuracy;
+    int avbr_convergence;
+} QSVEncContext;
+
+int ff_qsv_enc_init(AVCodecContext *avctx, QSVEncContext *q);
+
+int ff_qsv_encode(AVCodecContext *avctx, QSVEncContext *q,
+                  AVPacket *pkt, const AVFrame *frame, int *got_packet);
+
+int ff_qsv_enc_close(AVCodecContext *avctx, QSVEncContext *q);
+
+#endif /* AVCODEC_QSVENC_H */