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>
This commit is contained in:
@@ -564,7 +564,6 @@ void avcodec_register_all(void)
|
||||
REGISTER_BSF(IMX_DUMP_HEADER, imx_dump_header);
|
||||
REGISTER_BSF(MJPEG2JPEG, mjpeg2jpeg);
|
||||
REGISTER_BSF(MJPEGA_DUMP_HEADER, mjpega_dump_header);
|
||||
REGISTER_BSF(MP3_HEADER_COMPRESS, mp3_header_compress);
|
||||
REGISTER_BSF(MP3_HEADER_DECOMPRESS, mp3_header_decompress);
|
||||
REGISTER_BSF(MOV2TEXTSUB, mov2textsub);
|
||||
REGISTER_BSF(NOISE, noise);
|
||||
|
||||
Reference in New Issue
Block a user