ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Mon Aug 4 04:53:23 2014 +0200| [2b9044a6f0b0a6acebf24dbcb988d09c2a30f56f] | committer: Michael Niedermayer
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 <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2b9044a6f0b0a6acebf24dbcb988d09c2a30f56f --- _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog