From 7784f47762d59e859b4d0f74b3e021ad9368ee2c Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Thu, 28 Aug 2014 10:13:25 +0000 Subject: lavf: stop using avpriv_flac_parse_streaminfo() The only parameters needed by the demuxers are the sample rate and sample count, which can be trivially extracted manually, without resorting to an avpriv function. --- libavcodec/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'libavcodec') diff --git a/libavcodec/Makefile b/libavcodec/Makefile index b6a0c36359..627099798f 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -567,8 +567,6 @@ 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 \ - xiph.o OBJS-$(CONFIG_FLAC_MUXER) += flac.o flacdata.o OBJS-$(CONFIG_FLV_DEMUXER) += mpeg4audio.o OBJS-$(CONFIG_GXF_DEMUXER) += mpeg12data.o @@ -588,7 +586,7 @@ OBJS-$(CONFIG_MOV_MUXER) += mpeg4audio.o mpegaudiodata.o OBJS-$(CONFIG_MPEGTS_MUXER) += mpeg4audio.o OBJS-$(CONFIG_MPEGTS_DEMUXER) += mpeg4audio.o mpegaudiodata.o OBJS-$(CONFIG_NUT_MUXER) += mpegaudiodata.o -OBJS-$(CONFIG_OGG_DEMUXER) += xiph.o flac.o flacdata.o \ +OBJS-$(CONFIG_OGG_DEMUXER) += xiph.o \ mpeg12data.o \ dirac.o OBJS-$(CONFIG_OGG_MUXER) += xiph.o flac.o flacdata.o -- cgit v1.2.3