[FFmpeg-cvslog] Revert "avcodec/hevc: calculate checksum only if AV_EF_EXPLODE is set"
Michael Niedermayer
git at videolan.org
Wed Dec 4 12:03:30 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Dec 4 11:35:21 2013 +0100| [f1783c05f1398b7a08f16f6aafbcf38a5323e770] | committer: Michael Niedermayer
Revert "avcodec/hevc: calculate checksum only if AV_EF_EXPLODE is set"
This reverts commit 758b6d39f685a510f48ff9e4c05fffa859d23c42.
Requested-by: smarter
"now that http://git.videolan.org/?p=ffmpeg.git;a=commit;h=97de206b44a48da726807cc3e7b9448a8112760b
has been merged, http://git.videolan.org/?p=ffmpeg.git;a=commit;h=758b6d39f685a510f48ff9e4c05fffa859d23c42
could be reverted, this would reduce the delta with libav
(and it makes sense)"
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f1783c05f1398b7a08f16f6aafbcf38a5323e770
---
libavcodec/hevc.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c
index add6a7c..4294760 100644
--- a/libavcodec/hevc.c
+++ b/libavcodec/hevc.c
@@ -2570,10 +2570,9 @@ static int hevc_decode_frame(AVCodecContext *avctx, void *data, int *got_output,
/* verify the SEI checksum */
if (avctx->err_recognition & AV_EF_CRCCHECK && s->is_decoded &&
- avctx->err_recognition & AV_EF_EXPLODE &&
s->is_md5) {
ret = verify_md5(s, s->ref->frame);
- if (ret < 0) {
+ if (ret < 0 && avctx->err_recognition & AV_EF_EXPLODE) {
ff_hevc_unref_frame(s, s->ref, ~0);
return ret;
}
More information about the ffmpeg-cvslog
mailing list