diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-26 13:13:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-26 13:13:45 +0100 |
| commit | 75ec40b083ff40655a81c709ba5c9d867b2ed8a4 (patch) | |
| tree | 3c7a25d2e857dc269e8fa38aae9e812496f0f53f /libavcodec/Makefile | |
| parent | 625b29037e52bf46c15a7a1fccc83f6ef1647225 (diff) | |
| parent | c6080d89009056530119ab794ad02e4d515c7754 (diff) | |
| download | ffmpeg-75ec40b083ff40655a81c709ba5c9d867b2ed8a4.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavc: remove mp3_header_(de)compress bitstream filters
Conflicts:
Changelog
libavcodec/mp3_header_compress_bsf.c
libavcodec/mp3_header_decompress_bsf.c
The decompress filter is left in place for interoperability and support of
files that used the compress filter.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index e8c1c1b041..918013c348 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -798,7 +798,6 @@ OBJS-$(CONFIG_IMX_DUMP_HEADER_BSF) += imx_dump_header_bsf.o OBJS-$(CONFIG_MJPEG2JPEG_BSF) += mjpeg2jpeg_bsf.o mjpeg.o OBJS-$(CONFIG_MJPEGA_DUMP_HEADER_BSF) += mjpega_dump_header_bsf.o OBJS-$(CONFIG_MOV2TEXTSUB_BSF) += movsub_bsf.o -OBJS-$(CONFIG_MP3_HEADER_COMPRESS_BSF) += mp3_header_compress_bsf.o OBJS-$(CONFIG_MP3_HEADER_DECOMPRESS_BSF) += mp3_header_decompress_bsf.o \ mpegaudiodata.o OBJS-$(CONFIG_NOISE_BSF) += noise_bsf.o |