Merge commit '8c929037ec75fbe9f367e0a31ee34839e92de481'

* commit '8c929037ec75fbe9f367e0a31ee34839e92de481':
  build: Add a new component for H.264 parsing code

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

diff --cc configure
index c00c5910756bc915cf92ebdca84468b1a27f6f0e,ce52f50d07c5f92c17fc1fae85f9d38624e50863..ceaf1155f535ec9428e73948492af28ef2794cc1
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -2372,16 -1957,15 +2373,16 @@@ flv_decoder_select="h263_decoder
  flv_encoder_select="h263_encoder"
  fourxm_decoder_select="blockdsp bswapdsp"
  fraps_decoder_select="bswapdsp huffman"
 -g2m_decoder_deps="zlib"
 -g2m_decoder_select="blockdsp idctdsp jpegtables"
 -h261_decoder_select="mpeg_er mpegvideo"
 +g2m_decoder_select="blockdsp idctdsp jpegtables zlib"
 +g729_decoder_select="audiodsp"
 +h261_decoder_select="mpegvideo"
  h261_encoder_select="aandcttables mpegvideoenc"
 -h263_decoder_select="error_resilience h263_parser h263dsp mpeg_er mpegvideo qpeldsp"
 +h263_decoder_select="h263_parser h263dsp mpegvideo qpeldsp"
  h263_encoder_select="aandcttables h263dsp mpegvideoenc"
  h263i_decoder_select="h263_decoder"
 +h263p_decoder_select="h263_decoder"
  h263p_encoder_select="h263_encoder"
- h264_decoder_select="cabac golomb h264chroma h264dsp h264pred h264qpel videodsp"
+ h264_decoder_select="cabac golomb h264chroma h264dsp h264parse h264pred h264qpel videodsp"
  h264_decoder_suggest="error_resilience"
  hap_decoder_select="snappy texturedsp"
  hap_encoder_deps="libsnappy"
@@@ -2477,20 -2053,21 +2478,20 @@@ sonic_ls_encoder_select="golomb rangeco
  sp5x_decoder_select="mjpeg_decoder"
  svq1_decoder_select="hpeldsp"
  svq1_encoder_select="aandcttables hpeldsp me_cmp mpegvideoenc"
- svq3_decoder_select="golomb h264dsp h264pred hpeldsp tpeldsp videodsp"
+ svq3_decoder_select="golomb h264dsp h264parse h264pred hpeldsp tpeldsp videodsp"
  svq3_decoder_suggest="zlib"
  tak_decoder_select="audiodsp"
 -tdsc_decoder_deps="zlib"
 -tdsc_decoder_select="mjpeg_decoder"
 +tdsc_decoder_select="zlib mjpeg_decoder"
  theora_decoder_select="vp3_decoder"
  thp_decoder_select="mjpeg_decoder"
 -tiff_decoder_suggest="zlib"
 +tiff_decoder_suggest="zlib lzma"
  tiff_encoder_suggest="zlib"
 -truehd_decoder_select="mlp_decoder"
 +truehd_decoder_select="mlp_parser"
  truemotion2_decoder_select="bswapdsp"
  truespeech_decoder_select="bswapdsp"
 -tscc_decoder_deps="zlib"
 -txd_decoder_select="texturedsp"
 +tscc_decoder_select="zlib"
  twinvq_decoder_select="mdct lsp sinewin"
 +txd_decoder_select="texturedsp"
  utvideo_decoder_select="bswapdsp"
  utvideo_encoder_select="bswapdsp huffman huffyuvencdsp"
  vble_decoder_select="huffyuvdsp"
@@@ -2726,18 -2206,11 +2727,18 @@@ mpeg4_cuvid_decoder_select="mpeg4_cuvid
  nvenc_h264_encoder_deps="nvenc"
  nvenc_hevc_encoder_deps="nvenc"
  
 +vc1_cuvid_decoder_deps="cuda cuvid"
 +vc1_cuvid_decoder_select="vc1_cuvid_hwaccel"
 +vp8_cuvid_decoder_deps="cuda cuvid"
 +vp8_cuvid_decoder_select="vp8_cuvid_hwaccel"
 +vp9_cuvid_decoder_deps="cuda cuvid"
 +vp9_cuvid_decoder_select="vp9_cuvid_hwaccel"
 +
  # parsers
- h264_parser_select="golomb h264dsp"
+ h264_parser_select="golomb h264dsp h264parse"
  hevc_parser_select="golomb"
  mpegvideo_parser_select="mpegvideo"
 -mpeg4video_parser_select="error_resilience h263dsp mpegvideo qpeldsp"
 +mpeg4video_parser_select="h263dsp mpegvideo qpeldsp"
  vc1_parser_select="vc1dsp"
  
  # bitstream_filters

diff --cc libavcodec/Makefile
index 5fdc97f602b6c7e16d4e515ae152c686ef2de435,0660f96043ac1edac207c54ceaa50cf3bb467f29..4aa07878e55e01a23ca5b58fa59125ed1759b797
--- 1/libavcodec/Makefile
--- 2/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@@ -311,17 -252,11 +312,16 @@@ OBJS-$(CONFIG_H263_ENCODER)            
                                            h263.o ituh263enc.o flvenc.o h263data.o
  OBJS-$(CONFIG_H264_DECODER)            += h264dec.o h264_cabac.o h264_cavlc.o \
                                            h264_direct.o h264_loopfilter.o  \
-                                           h264_mb.o h264_picture.o h264_ps.o \
+                                           h264_mb.o h264_picture.o \
                                            h264_refs.o h264_sei.o \
-                                           h264_slice.o h264data.o h264_parse.o \
-                                           h2645_parse.o
+                                           h264_slice.o h264data.o
 +OBJS-$(CONFIG_H264_CUVID_DECODER)      += cuvid.o
 +OBJS-$(CONFIG_H264_MEDIACODEC_DECODER) += mediacodecdec.o
  OBJS-$(CONFIG_H264_MMAL_DECODER)       += mmaldec.o
  OBJS-$(CONFIG_H264_NVENC_ENCODER)      += nvenc_h264.o
 +OBJS-$(CONFIG_NVENC_ENCODER)           += nvenc_h264.o
 +OBJS-$(CONFIG_NVENC_H264_ENCODER)      += nvenc_h264.o
 +OBJS-$(CONFIG_H264_VDA_DECODER)        += vda_h264_dec.o
  OBJS-$(CONFIG_H264_OMX_ENCODER)        += omx.o
  OBJS-$(CONFIG_H264_QSV_DECODER)        += qsvdec_h2645.o
  OBJS-$(CONFIG_H264_QSV_ENCODER)        += qsvenc_h264.o
@@@ -534,21 -427,15 +534,20 @@@ OBJS-$(CONFIG_SUNRAST_ENCODER)         
  OBJS-$(CONFIG_SVQ1_DECODER)            += svq1dec.o svq1.o svq13.o h263data.o
  OBJS-$(CONFIG_SVQ1_ENCODER)            += svq1enc.o svq1.o  h263data.o  \
                                            h263.o ituh263enc.o
- OBJS-$(CONFIG_SVQ3_DECODER)            += svq3.o svq13.o mpegutils.o \
-                                           h264_parse.o h264data.o h264_ps.o h2645_parse.o
+ OBJS-$(CONFIG_SVQ3_DECODER)            += svq3.o svq13.o mpegutils.o h264data.o
 -OBJS-$(CONFIG_TAK_DECODER)             += takdec.o tak.o
 +OBJS-$(CONFIG_TEXT_DECODER)            += textdec.o ass.o
 +OBJS-$(CONFIG_TEXT_ENCODER)            += srtenc.o ass_split.o
 +OBJS-$(CONFIG_TAK_DECODER)             += takdec.o tak.o takdsp.o
  OBJS-$(CONFIG_TARGA_DECODER)           += targa.o
  OBJS-$(CONFIG_TARGA_ENCODER)           += targaenc.o rle.o
 +OBJS-$(CONFIG_TARGA_Y216_DECODER)      += targa_y216dec.o
  OBJS-$(CONFIG_TDSC_DECODER)            += tdsc.o
  OBJS-$(CONFIG_TIERTEXSEQVIDEO_DECODER) += tiertexseqv.o
 -OBJS-$(CONFIG_TIFF_DECODER)            += tiff.o lzw.o faxcompr.o
 -OBJS-$(CONFIG_TIFF_ENCODER)            += tiffenc.o rle.o lzwenc.o
 +OBJS-$(CONFIG_TIFF_DECODER)            += tiff.o lzw.o faxcompr.o tiff_data.o tiff_common.o
 +OBJS-$(CONFIG_TIFF_ENCODER)            += tiffenc.o rle.o lzwenc.o tiff_data.o
  OBJS-$(CONFIG_TMV_DECODER)             += tmv.o cga_data.o
 +OBJS-$(CONFIG_TRUEHD_DECODER)          += mlpdec.o mlpdsp.o
 +OBJS-$(CONFIG_TRUEHD_ENCODER)          += mlpenc.o
  OBJS-$(CONFIG_TRUEMOTION1_DECODER)     += truemotion1.o
  OBJS-$(CONFIG_TRUEMOTION2_DECODER)     += truemotion2.o
  OBJS-$(CONFIG_TRUEMOTION2RT_DECODER)   += truemotion2rt.o