diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-13 02:28:36 +0300 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-13 02:28:57 +0300 |
commit | 9e810a98a26391fd32f94e984a0a997ad77b77fe (patch) | |
tree | 931df66abe50af9087c6b67754bfec0dec25728e /configure | |
parent | 99558270ed1e1c0d8906439b47085860ee0b08bd (diff) | |
parent | 650060dfb665552442ec11b456660e3e9a9d9016 (diff) |
Merge commit '650060dfb665552442ec11b456660e3e9a9d9016'
* commit '650060dfb665552442ec11b456660e3e9a9d9016':
hevc_parser: parse and export some stream parameters
Conflicts:
configure
libavcodec/hevc_parser.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2440,7 +2440,7 @@ wmv3_vdpau_hwaccel_select="vc1_vdpau_hwaccel" # parsers h264_parser_select="h264_decoder" -hevc_parser_select="hevc_decoder" +hevc_parser_select="golomb" mpegvideo_parser_select="mpegvideo" mpeg4video_parser_select="error_resilience h263dsp mpeg_er mpegvideo qpeldsp" vc1_parser_select="mpegvideo startcode vc1_decoder" |