mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-27 01:42:20 +00: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:
commit
2b9044a6f0