diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 13:23:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 13:23:48 +0100 |
| commit | 329a3286d648414b672a983427e5c7d38589f7f9 (patch) | |
| tree | 36ceddc1dd93c08dbcbffec317db574310eaf46e /configure | |
| parent | 29be9b5301212d29186a05f262a6ce04ddbc168c (diff) | |
| parent | be039278b5ebd8075d90a3508db2aed5adf59e02 (diff) | |
| download | ffmpeg-streaming-329a3286d648414b672a983427e5c7d38589f7f9.zip ffmpeg-streaming-329a3286d648414b672a983427e5c7d38589f7f9.tar.gz | |
Merge commit 'be039278b5ebd8075d90a3508db2aed5adf59e02'
* commit 'be039278b5ebd8075d90a3508db2aed5adf59e02':
mpegvideo: move ff_draw_horiz_band() to mpegutils.c
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2087,7 +2087,7 @@ sonic_ls_encoder_select="golomb" sp5x_decoder_select="mjpeg_decoder" svq1_decoder_select="hpeldsp" svq1_encoder_select="aandcttables dsputil hpeldsp mpegvideoenc" -svq3_decoder_select="h264_decoder hpeldsp mpegvideo" +svq3_decoder_select="h264_decoder hpeldsp" svq3_decoder_suggest="zlib" tak_decoder_select="dsputil" theora_decoder_select="vp3_decoder" |
