mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-19 05:49:09 +02:00
c607a2cc97
* qatar/master: sparc: Eliminate dead code in VIS acceleration macros flacdec: drop unnecessary assert mjpegdec: properly report unsupported disabled features Conflicts: libavcodec/flacdec.c libavcodec/mjpegdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>