diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-24 18:12:26 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-24 18:12:26 +0000 |
| commit | d61849f0b7f0bde408a14e477453673ebec39739 (patch) | |
| tree | e7c66729b8a9c8c2b8709831b6a0d16611787080 | |
| parent | 0ffaae60e8492f7e797e72338c7e6f3efcd52330 (diff) | |
| parent | b10c33c5ea9a41c41726fb5488ea1633e3f898ac (diff) | |
| download | ffmpeg-d61849f0b7f0bde408a14e477453673ebec39739.tar.gz | |
Merge commit 'b10c33c5ea9a41c41726fb5488ea1633e3f898ac'
* commit 'b10c33c5ea9a41c41726fb5488ea1633e3f898ac':
build: Add missing mpegvideo dependency for the MSS2 and VC-1 decoders
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| -rwxr-xr-x | configure | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -2383,7 +2383,7 @@ msmpeg4v2_decoder_select="h263_decoder" msmpeg4v2_encoder_select="h263_encoder" msmpeg4v3_decoder_select="h263_decoder" msmpeg4v3_encoder_select="h263_encoder" -mss2_decoder_select="vc1_decoder" +mss2_decoder_select="vc1_decoder mpegvideo" mts2_decoder_select="mss34dsp" mxpeg_decoder_select="mjpeg_decoder" nellymoser_decoder_select="mdct sinewin" @@ -2438,7 +2438,7 @@ txd_decoder_select="texturedsp" utvideo_decoder_select="bswapdsp" utvideo_encoder_select="bswapdsp huffman huffyuvencdsp" vble_decoder_select="huffyuvdsp" -vc1_decoder_select="blockdsp h263_decoder h264qpel intrax8 qpeldsp startcode" +vc1_decoder_select="blockdsp h263_decoder h264qpel intrax8 mpegvideo qpeldsp startcode" vc1_qsv_decoder_deps="libmfx" vc1_qsv_decoder_select="qsvdec vc1_qsv_hwaccel" vc1image_decoder_select="vc1_decoder" |