diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-20 14:39:33 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-20 14:39:33 +0100 |
| commit | fdba564585e50b69489a95b847df21779a7cd19a (patch) | |
| tree | 83b5d797856a44bb113596174e5ac4d12f6c1843 /configure | |
| parent | 3edc3b159503d512c919b3d5902f7026e961823a (diff) | |
| parent | 192ccc5034ad4ac1b5022fc16c1162267add6a0f (diff) | |
Merge commit '192ccc5034ad4ac1b5022fc16c1162267add6a0f'
* commit '192ccc5034ad4ac1b5022fc16c1162267add6a0f':
build: The MPEG-4 video parser depends on h263dsp
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2136,7 +2136,7 @@ wmv3_vdpau_hwaccel_select="vc1_vdpau_hwaccel" # parsers h264_parser_select="golomb h264chroma h264dsp h264pred h264qpel videodsp" hevc_parser_select="hevc_decoder" -mpeg4video_parser_select="error_resilience mpegvideo" +mpeg4video_parser_select="error_resilience h263dsp mpegvideo" mpegvideo_parser_select="error_resilience mpegvideo" vc1_parser_select="mpegvideo" |