mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2025-02-18 19:10:21 +00:00

* commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff': mp3: exit on parsing error in mp_decode_frame rtmppkt: Avoid unescaped backslash in Doxygen comment fate-lavfi: replace sed/grep/cut combos with awk build: Plan 9 support Conflicts: configure tests/lavfi-regression.sh Merged-by: Michael Niedermayer <michaelni@gmx.at>