diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-04 11:35:21 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-04 11:46:31 +0100 |
| commit | f1783c05f1398b7a08f16f6aafbcf38a5323e770 (patch) | |
| tree | d56e272d205f098a642418d7aab7f7ea4b3e8a15 /libavcodec/hevc.c | |
| parent | c30281164352ac33a06b155730fe669485852669 (diff) | |
| download | ffmpeg-f1783c05f1398b7a08f16f6aafbcf38a5323e770.tar.gz | |
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)"
Diffstat (limited to 'libavcodec/hevc.c')
| -rw-r--r-- | libavcodec/hevc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c index add6a7ccd0..4294760bb7 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; } |