summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2016-11-14 10:09:44 +0100
committerHendrik Leppkes <h.leppkes@gmail.com>2016-11-14 10:09:44 +0100
commit575e8d11f1ebba9f3d9076862b099b7f94e4eb4a (patch)
tree88f3018b05b2563986841c1fa7ea6c36f8187a36 /configure
parenta81b9c60125f24ae1101be7429b15e74031453e7 (diff)
parent8c929037ec75fbe9f367e0a31ee34839e92de481 (diff)
downloadffmpeg-575e8d11f1ebba9f3d9076862b099b7f94e4eb4a.tar.gz
Merge commit '8c929037ec75fbe9f367e0a31ee34839e92de481'
* commit '8c929037ec75fbe9f367e0a31ee34839e92de481': build: Add a new component for H.264 parsing code Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure7
1 files changed, 4 insertions, 3 deletions
diff --git a/configure b/configure
index c00c591075..ceaf1155f5 100755
--- a/configure
+++ b/configure
@@ -2056,6 +2056,7 @@ CONFIG_EXTRA="
h263dsp
h264chroma
h264dsp
+ h264parse
h264pred
h264qpel
hpeldsp
@@ -2381,7 +2382,7 @@ 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,7 +2478,7 @@ sonic_ls_encoder_select="golomb rangecoder"
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_select="zlib mjpeg_decoder"
@@ -2734,7 +2735,7 @@ 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="h263dsp mpegvideo qpeldsp"