Changeset 75ec40b0 in ffmpeg

Timestamp:

Nov 26, 2013, 12:13:45 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

3c846fda

Parents:

625b2903 (diff), c6080d89 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

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>

(No files)