Merge commit 'b04d009b0e1a34b717f3d3bbf407aef0c742aff1'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Mar 2015 00:03:23 +0000 (01:03 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Mar 2015 00:03:23 +0000 (01:03 +0100)
* commit 'b04d009b0e1a34b717f3d3bbf407aef0c742aff1':
  qsv: rename to qsvdec

Conflicts:
libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure
libavcodec/Makefile
libavcodec/qsvdec.c
libavcodec/qsvdec.h
libavcodec/qsvdec_h264.c

diff --cc configure
+++ b/configure
@@@ -2147,10 -1828,10 +2147,10 @@@ h263p_encoder_select="h263_encoder
  h264_decoder_select="cabac golomb h264chroma h264dsp h264pred h264qpel startcode videodsp"
  h264_decoder_suggest="error_resilience"
  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"
 -huffyuv_decoder_select="bswapdsp huffyuvdsp"
 -huffyuv_encoder_select="bswapdsp huffman huffyuvencdsp"
 +huffyuv_decoder_select="bswapdsp huffyuvdsp llviddsp"
 +huffyuv_encoder_select="bswapdsp huffman huffyuvencdsp llviddsp"
  iac_decoder_select="imc_decoder"
  imc_decoder_select="bswapdsp fft mdct sinewin"
  indeo3_decoder_select="hpeldsp"
@@@ -89,10 -78,9 +89,10 @@@ OBJS-$(CONFIG_MPEGVIDEO)               
  OBJS-$(CONFIG_MPEGVIDEOENC)            += mpegvideo_enc.o mpeg12data.o  \
                                            motion_est.o ratecontrol.o    \
                                            mpegvideoencdsp.o
 +OBJS-$(CONFIG_NVENC)                   += nvenc.o
  OBJS-$(CONFIG_PIXBLOCKDSP)             += pixblockdsp.o
  OBJS-$(CONFIG_QPELDSP)                 += qpeldsp.o
- OBJS-$(CONFIG_QSV)                     += qsv.o
+ OBJS-$(CONFIG_QSVDEC)                  += qsvdec.o
  OBJS-$(CONFIG_RANGECODER)              += rangecoder.o
  RDFT-OBJS-$(CONFIG_HARDCODED_TABLES)   += sin_tables.o
  OBJS-$(CONFIG_RDFT)                    += rdft.o $(RDFT-OBJS-yes)
@@@ -267,8 -222,7 +267,8 @@@ OBJS-$(CONFIG_H264_DECODER)            
                                            h264_direct.o h264_loopfilter.o  \
                                            h264_mb.o h264_picture.o h264_ps.o \
                                            h264_refs.o h264_sei.o h264_slice.o
- OBJS-$(CONFIG_H264_QSV_DECODER)        += qsv_h264.o
 +OBJS-$(CONFIG_H264_VDA_DECODER)        += vda_h264_dec.o
+ OBJS-$(CONFIG_H264_QSV_DECODER)        += qsvdec_h264.o
  OBJS-$(CONFIG_HEVC_DECODER)            += hevc.o hevc_mvs.o hevc_ps.o hevc_sei.o \
                                            hevc_cabac.o hevc_refs.o hevcpred.o    \
                                            hevcdsp.o hevc_filter.o
@@@ -864,9 -718,8 +864,9 @@@ SKIPHEADERS                            
  
  SKIPHEADERS-$(CONFIG_DXVA2)            += dxva2.h dxva2_internal.h
  SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER)  += libschroedinger.h
 -SKIPHEADERS-$(CONFIG_MPEG_XVMC_DECODER) += xvmc.h
 +SKIPHEADERS-$(CONFIG_LIBUTVIDEO)       += libutvideo.h
- SKIPHEADERS-$(CONFIG_QSV)              += qsv.h qsv_internal.h
+ SKIPHEADERS-$(CONFIG_QSVDEC)           += qsv.h qsvdec.h
 +SKIPHEADERS-$(CONFIG_XVMC)             += xvmc.h
  SKIPHEADERS-$(CONFIG_VAAPI)            += vaapi_internal.h
  SKIPHEADERS-$(CONFIG_VDA)              += vda.h vda_internal.h
  SKIPHEADERS-$(CONFIG_VDPAU)            += vdpau.h vdpau_internal.h
Simple merge
Simple merge
Simple merge