diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-06 13:41:07 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-06 13:42:41 +0100 |
| commit | b6a99563962c27380e14c6f725cc8f6ae9ee5d22 (patch) | |
| tree | 87331cbe19780965be15699b3ee7c4051e60bd83 /libavcodec | |
| parent | a51eb6d34ceda7cc4f46fc3f9d0e9b57eba61cb6 (diff) | |
| parent | 7784f47762d59e859b4d0f74b3e021ad9368ee2c (diff) | |
| download | ffmpeg-b6a99563962c27380e14c6f725cc8f6ae9ee5d22.tar.gz | |
Merge commit '7784f47762d59e859b4d0f74b3e021ad9368ee2c'
* commit '7784f47762d59e859b4d0f74b3e021ad9368ee2c':
lavf: stop using avpriv_flac_parse_streaminfo()
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 75c1008269..0ac01c0b91 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -678,8 +678,7 @@ OBJS-$(CONFIG_VC1_VDPAU_HWACCEL) += vdpau_vc1.o OBJS-$(CONFIG_ADTS_MUXER) += mpeg4audio.o OBJS-$(CONFIG_CAF_DEMUXER) += mpeg4audio.o mpegaudiodata.o \ ac3tab.o -OBJS-$(CONFIG_FLAC_DEMUXER) += flac.o flacdata.o vorbis_data.o \ - xiph.o +OBJS-$(CONFIG_FLAC_DEMUXER) += flac.o flacdata.o vorbis_data.o OBJS-$(CONFIG_FLAC_MUXER) += flac.o flacdata.o vorbis_data.o OBJS-$(CONFIG_FLV_DEMUXER) += mpeg4audio.o OBJS-$(CONFIG_GXF_DEMUXER) += mpeg12data.o @@ -701,7 +700,7 @@ OBJS-$(CONFIG_MPEGTS_DEMUXER) += mpeg4audio.o mpegaudiodata.o OBJS-$(CONFIG_MXF_MUXER) += dnxhddata.o OBJS-$(CONFIG_NUT_MUXER) += mpegaudiodata.o OBJS-$(CONFIG_OGA_MUXER) += xiph.o flac.o flacdata.o -OBJS-$(CONFIG_OGG_DEMUXER) += xiph.o flac.o flacdata.o \ +OBJS-$(CONFIG_OGG_DEMUXER) += xiph.o \ mpeg12data.o \ dirac.o vorbis_data.o OBJS-$(CONFIG_OGG_MUXER) += xiph.o flac.o flacdata.o \ |