Merge commit 'b04d009b0e1a34b717f3d3bbf407aef0c742aff1'

* commit 'b04d009b0e1a34b717f3d3bbf407aef0c742aff1':
  qsv: rename to qsvdec

Conflicts:
	libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 0 insertions, 86 deletions

diff --git a/libavcodec/qsv_internal.h b/libavcodec/qsv_internal.h
deleted file mode 100644
index c154eaff86..0000000000
--- a/libavcodec/qsv_internal.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Intel MediaSDK QSV utility functions
- *
- * copyright (c) 2013 Luca Barbato
- *
- * 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_QSV_INTERNAL_H
-#define AVCODEC_QSV_INTERNAL_H
-
-#include <stdint.h>
-#include <sys/types.h>
-
-#include <mfx/mfxvideo.h>
-
-#include "libavutil/frame.h"
-#include "libavutil/pixfmt.h"
-
-#include "avcodec.h"
-
-#define QSV_VERSION_MAJOR 1
-#define QSV_VERSION_MINOR 1
-
-#define ASYNC_DEPTH_DEFAULT 4       // internal parallelism
-
-typedef struct QSVFrame {
-    AVFrame *frame;
-    mfxFrameSurface1 *surface;
-
-    mfxFrameSurface1 surface_internal;
-
-    struct QSVFrame *next;
-} QSVFrame;
-
-typedef struct QSVContext {
-    // the session used for decoding
-    mfxSession session;
-
-    // the session we allocated internally, in case the caller did not provide
-    // one
-    mfxSession internal_session;
-
-    /**
-     * a linked list of frames currently being used by QSV
-     */
-    QSVFrame *work_frames;
-
-    // options set by the caller
-    int async_depth;
-    int iopattern;
-
-    mfxExtBuffer **ext_buffers;
-    int         nb_ext_buffers;
-} QSVContext;
-
-/**
- * Convert a libmfx error code into a ffmpeg error code.
- */
-int ff_qsv_error(int mfx_err);
-
-int ff_qsv_map_pixfmt(enum AVPixelFormat format);
-
-int ff_qsv_init(AVCodecContext *s, QSVContext *q, mfxSession session);
-
-int ff_qsv_decode(AVCodecContext *s, QSVContext *q,
-                  AVFrame *frame, int *got_frame,
-                  AVPacket *avpkt);
-
-int ff_qsv_close(QSVContext *q);
-
-#endif /* AVCODEC_QSV_INTERNAL_H */