You've already forked FFmpeg
mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-08-15 14:13:16 +02:00
Merge commit '3160bdc7f7bc27bb67561270b4e730cd2d844afd'
* commit '3160bdc7f7bc27bb67561270b4e730cd2d844afd': huffyuv: Use avpriv_report_missing_feature() where appropriate Conflicts: libavcodec/huffyuvdec.c Not merged, the error messages are not about missing support of features of the input file. avpriv_report_missing_feature() speaks about "... your file has a feature which has not been implemented" Thats would simply not be correct Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in: