diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-09 22:21:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-09 22:27:07 +0200 |
| commit | 1b58f1376132026a7633fea253f0ed67a8392343 (patch) | |
| tree | a9c9f17d083967a9e231643e8fee155f9f678a6c /configure | |
| parent | 9098f0ecd7bfa8e971ab92bd0c244cb003ef43b2 (diff) | |
| parent | f6ee61fb05482c617f5deee29a190d8ff483b3d1 (diff) | |
| download | ffmpeg-streaming-1b58f1376132026a7633fea253f0ed67a8392343.zip ffmpeg-streaming-1b58f1376132026a7633fea253f0ed67a8392343.tar.gz | |
Merge commit 'f6ee61fb05482c617f5deee29a190d8ff483b3d1'
* commit 'f6ee61fb05482c617f5deee29a190d8ff483b3d1':
lavc: export DV profile API used by muxer/demuxer as public
Conflicts:
configure
doc/APIchanges
libavcodec/Makefile
libavcodec/dv_profile.c
libavcodec/dv_profile.h
libavcodec/version.h
libavformat/dvenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -1801,6 +1801,7 @@ CONFIG_EXTRA=" bswapdsp cabac dsputil + dvprofile exif fdctdsp frame_thread_encoder @@ -2045,8 +2046,8 @@ dca_decoder_select="mdct" dirac_decoder_select="dsputil dwt golomb videodsp" dnxhd_decoder_select="blockdsp idctdsp" dnxhd_encoder_select="aandcttables blockdsp dsputil fdctdsp idctdsp mpegvideoenc" -dvvideo_decoder_select="idctdsp" -dvvideo_encoder_select="dsputil fdctdsp" +dvvideo_decoder_select="dvprofile idctdsp" +dvvideo_encoder_select="dsputil dvprofile fdctdsp" dxa_decoder_select="zlib" eac3_decoder_select="ac3_decoder" eac3_encoder_select="ac3_encoder" @@ -2355,6 +2356,8 @@ caf_demuxer_select="riffdec" dirac_demuxer_select="dirac_parser" dts_demuxer_select="dca_parser" dtshd_demuxer_select="dca_parser" +dv_demuxer_select="dvprofile" +dv_muxer_select="dvprofile" dxa_demuxer_select="riffdec" eac3_demuxer_select="ac3_parser" f4v_muxer_select="mov_muxer" |
