qsv: rename to qsvdec

This is to avoid conflicts with the upcoming QSV encoding support.
pull/127/head
Anton Khirnov 10 years ago
parent 1188119624
commit b04d009b0e
  1. 4
      configure
  2. 6
      libavcodec/Makefile
  3. 2
      libavcodec/qsvdec.c
  4. 6
      libavcodec/qsvdec.h
  5. 2
      libavcodec/qsvdec_h264.c

4
configure vendored

@ -1597,7 +1597,7 @@ CONFIG_EXTRA="
nettle nettle
pixblockdsp pixblockdsp
qpeldsp qpeldsp
qsv qsvdec
rangecoder rangecoder
riffdec riffdec
riffenc riffenc
@ -1828,7 +1828,7 @@ h263p_encoder_select="h263_encoder"
h264_decoder_select="cabac golomb h264chroma h264dsp h264pred h264qpel startcode videodsp" h264_decoder_select="cabac golomb h264chroma h264dsp h264pred h264qpel startcode videodsp"
h264_decoder_suggest="error_resilience" h264_decoder_suggest="error_resilience"
h264_qsv_decoder_deps="libmfx" h264_qsv_decoder_deps="libmfx"
h264_qsv_decoder_select="h264_mp4toannexb_bsf h264_parser qsv h264_qsv_hwaccel" h264_qsv_decoder_select="h264_mp4toannexb_bsf h264_parser qsvdec h264_qsv_hwaccel"
hevc_decoder_select="bswapdsp cabac golomb videodsp" hevc_decoder_select="bswapdsp cabac golomb videodsp"
huffyuv_decoder_select="bswapdsp huffyuvdsp" huffyuv_decoder_select="bswapdsp huffyuvdsp"
huffyuv_encoder_select="bswapdsp huffman huffyuvencdsp" huffyuv_encoder_select="bswapdsp huffman huffyuvencdsp"

@ -80,7 +80,7 @@ OBJS-$(CONFIG_MPEGVIDEOENC) += mpegvideo_enc.o mpeg12data.o \
mpegvideoencdsp.o mpegvideoencdsp.o
OBJS-$(CONFIG_PIXBLOCKDSP) += pixblockdsp.o OBJS-$(CONFIG_PIXBLOCKDSP) += pixblockdsp.o
OBJS-$(CONFIG_QPELDSP) += qpeldsp.o OBJS-$(CONFIG_QPELDSP) += qpeldsp.o
OBJS-$(CONFIG_QSV) += qsv.o OBJS-$(CONFIG_QSVDEC) += qsvdec.o
OBJS-$(CONFIG_RANGECODER) += rangecoder.o OBJS-$(CONFIG_RANGECODER) += rangecoder.o
RDFT-OBJS-$(CONFIG_HARDCODED_TABLES) += sin_tables.o RDFT-OBJS-$(CONFIG_HARDCODED_TABLES) += sin_tables.o
OBJS-$(CONFIG_RDFT) += rdft.o $(RDFT-OBJS-yes) OBJS-$(CONFIG_RDFT) += rdft.o $(RDFT-OBJS-yes)
@ -222,7 +222,7 @@ OBJS-$(CONFIG_H264_DECODER) += h264.o h264_cabac.o h264_cavlc.o \
h264_direct.o h264_loopfilter.o \ h264_direct.o h264_loopfilter.o \
h264_mb.o h264_picture.o h264_ps.o \ h264_mb.o h264_picture.o h264_ps.o \
h264_refs.o h264_sei.o h264_slice.o h264_refs.o h264_sei.o h264_slice.o
OBJS-$(CONFIG_H264_QSV_DECODER) += qsv_h264.o OBJS-$(CONFIG_H264_QSV_DECODER) += qsvdec_h264.o
OBJS-$(CONFIG_HEVC_DECODER) += hevc.o hevc_mvs.o hevc_ps.o hevc_sei.o \ OBJS-$(CONFIG_HEVC_DECODER) += hevc.o hevc_mvs.o hevc_ps.o hevc_sei.o \
hevc_cabac.o hevc_refs.o hevcpred.o \ hevc_cabac.o hevc_refs.o hevcpred.o \
hevcdsp.o hevc_filter.o hevcdsp.o hevc_filter.o
@ -719,7 +719,7 @@ SKIPHEADERS += %_tablegen.h \
SKIPHEADERS-$(CONFIG_DXVA2) += dxva2.h dxva2_internal.h SKIPHEADERS-$(CONFIG_DXVA2) += dxva2.h dxva2_internal.h
SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER) += libschroedinger.h SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER) += libschroedinger.h
SKIPHEADERS-$(CONFIG_MPEG_XVMC_DECODER) += xvmc.h SKIPHEADERS-$(CONFIG_MPEG_XVMC_DECODER) += xvmc.h
SKIPHEADERS-$(CONFIG_QSV) += qsv.h qsv_internal.h SKIPHEADERS-$(CONFIG_QSVDEC) += qsv.h qsvdec.h
SKIPHEADERS-$(CONFIG_VAAPI) += vaapi_internal.h SKIPHEADERS-$(CONFIG_VAAPI) += vaapi_internal.h
SKIPHEADERS-$(CONFIG_VDA) += vda.h vda_internal.h SKIPHEADERS-$(CONFIG_VDA) += vda.h vda_internal.h
SKIPHEADERS-$(CONFIG_VDPAU) += vdpau.h vdpau_internal.h SKIPHEADERS-$(CONFIG_VDPAU) += vdpau.h vdpau_internal.h

@ -34,7 +34,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "internal.h" #include "internal.h"
#include "qsv_internal.h" #include "qsvdec.h"
int ff_qsv_error(int mfx_err) int ff_qsv_error(int mfx_err)
{ {

@ -20,8 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef AVCODEC_QSV_INTERNAL_H #ifndef AVCODEC_QSVDEC_H
#define AVCODEC_QSV_INTERNAL_H #define AVCODEC_QSVDEC_H
#include <stdint.h> #include <stdint.h>
#include <sys/types.h> #include <sys/types.h>
@ -83,4 +83,4 @@ int ff_qsv_decode(AVCodecContext *s, QSVContext *q,
int ff_qsv_close(QSVContext *q); int ff_qsv_close(QSVContext *q);
#endif /* AVCODEC_QSV_INTERNAL_H */ #endif /* AVCODEC_QSVDEC_H */

@ -33,7 +33,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "internal.h" #include "internal.h"
#include "qsv_internal.h" #include "qsvdec.h"
#include "qsv.h" #include "qsv.h"
typedef struct QSVH264Context { typedef struct QSVH264Context {
Loading…
Cancel
Save