Merge commit 'c3f0357bdf7d3c542aad2c58b94184b9f56edc41'
authorJames Almer <jamrial@gmail.com>
Tue, 31 Oct 2017 15:48:36 +0000 (12:48 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 31 Oct 2017 15:48:36 +0000 (12:48 -0300)
* commit 'c3f0357bdf7d3c542aad2c58b94184b9f56edc41':
  hevcdec: move the MD5 context out of HEVCSEIPictureHash back into HEVCContext

Merged-by: James Almer <jamrial@gmail.com>
1  2 
libavcodec/hevc_sei.h
libavcodec/hevcdec.c
libavcodec/hevcdec.h

Simple merge
@@@ -3200,14 -2893,9 +3200,14 @@@ static av_cold int hevc_decode_free(AVC
  
      pic_arrays_free(s);
  
-     av_freep(&s->sei.picture_hash.md5_ctx);
+     av_freep(&s->md5_ctx);
  
 -    av_frame_free(&s->tmp_frame);
 +    av_freep(&s->cabac_state);
 +
 +    for (i = 0; i < 3; i++) {
 +        av_freep(&s->sao_pixel_buffer_h[i]);
 +        av_freep(&s->sao_pixel_buffer_v[i]);
 +    }
      av_frame_free(&s->output_frame);
  
      for (i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++) {
  #ifndef AVCODEC_HEVCDEC_H
  #define AVCODEC_HEVCDEC_H
  
 -#include <stddef.h>
 -#include <stdint.h>
 +#include <stdatomic.h>
  
  #include "libavutil/buffer.h"
+ #include "libavutil/md5.h"
  
  #include "avcodec.h"
  #include "bswapdsp.h"