diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-26 13:22:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-26 13:22:48 +0100 |
| commit | 2cdedcbceab952297d5ee0f433b5a5c7482e48d6 (patch) | |
| tree | d4e6a15939fa7655758c99ca15e369cd9d9c666a /configure | |
| parent | 795b911bd8acaec4b6f7dc1590f63a529c028ac8 (diff) | |
| parent | 75644335b907919057960716508477239c26fed4 (diff) | |
| download | ffmpeg-2cdedcbceab952297d5ee0f433b5a5c7482e48d6.tar.gz | |
Merge commit '75644335b907919057960716508477239c26fed4'
* commit '75644335b907919057960716508477239c26fed4':
lavc: Move start code finding to utils.c
Conflicts:
configure
libavcodec/mpegvideo.c
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -1699,7 +1699,7 @@ atrac3_decoder_select="mdct" bink_decoder_select="dsputil hpeldsp" binkaudio_dct_decoder_select="mdct rdft dct sinewin" binkaudio_rdft_decoder_select="mdct rdft sinewin" -cavs_decoder_select="dsputil golomb h264chroma mpegvideo videodsp" +cavs_decoder_select="dsputil golomb h264chroma videodsp" cllc_decoder_select="dsputil" comfortnoise_encoder_select="lpc" cook_decoder_select="dsputil mdct sinewin" @@ -1987,13 +1987,12 @@ mov_demuxer_suggest="zlib" mov_muxer_select="rtpenc_chain" mp3_demuxer_select="mpegaudio_parser" mp4_muxer_select="mov_muxer" -mpegts_muxer_select="adts_muxer latm_muxer mpegvideo" +mpegts_muxer_select="adts_muxer latm_muxer" mpegtsraw_demuxer_select="mpegts_demuxer" mxf_d10_muxer_select="mxf_muxer" ogg_demuxer_select="golomb" psp_muxer_select="mov_muxer" rtp_demuxer_select="sdp_demuxer" -rtp_muxer_select="mpegvideo" rtpdec_select="asf_demuxer rm_demuxer rtp_protocol mpegts_demuxer mov_demuxer" rtsp_demuxer_select="http_protocol rtpdec" rtsp_muxer_select="rtp_muxer http_protocol rtp_protocol rtpenc_chain" |