Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 26 Nov 2013 12:13:45 +0000 (13:13 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 26 Nov 2013 12:13:45 +0000 (13:13 +0100)
commit75ec40b083ff40655a81c709ba5c9d867b2ed8a4
tree3c7a25d2e857dc269e8fa38aae9e812496f0f53f
parent625b29037e52bf46c15a7a1fccc83f6ef1647225
parentc6080d89009056530119ab794ad02e4d515c7754
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>
Changelog
libavcodec/Makefile
libavcodec/allcodecs.c