mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-19 05:49:09 +02:00
65b8527993
* commit 'f7bf72a4a1146a7583577c9bdc066767e1ba3c6a': idcinvideo: correctly set AVFrame defaults yadif: Port inline assembly to yasm au: remove unnecessary casts au: return AVERROR codes instead of -1 Conflicts: libavcodec/idcinvideo.c libavfilter/x86/yadif_template.c libavformat/au.c Merged-by: Michael Niedermayer <michaelni@gmx.at>