]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit '9833a406d3d743d238e4cbee08ffcaa12e067dd2'
authorClément Bœsch <cboesch@gopro.com>
Tue, 31 Jan 2017 16:35:41 +0000 (17:35 +0100)
committerClément Bœsch <cboesch@gopro.com>
Tue, 31 Jan 2017 16:35:41 +0000 (17:35 +0100)
* commit '9833a406d3d743d238e4cbee08ffcaa12e067dd2':
  examples: Properly free AVCodecContext

Merged-by: Clément Bœsch <cboesch@gopro.com>
1  2 
doc/examples/decoding_encoding.c

index 43a64c2d5952b3332ab8a18000d014e83899940d,8fee5526dfae2eb36867ef0f5b083bdab0b7c3e7..1c5a78a44d0701de63d52ed7950327f75fa9c6ba
@@@ -479,10 -426,9 +477,9 @@@ static void video_encode_example(const 
      fwrite(endcode, 1, sizeof(endcode), f);
      fclose(f);
  
-     avcodec_close(c);
-     av_free(c);
+     avcodec_free_context(&c);
 -    av_freep(&picture->data[0]);
 -    av_frame_free(&picture);
 +    av_freep(&frame->data[0]);
 +    av_frame_free(&frame);
      printf("\n");
  }
  
@@@ -622,9 -562,8 +619,8 @@@ static void video_decode_example(const 
  
      fclose(f);
  
-     avcodec_close(c);
-     av_free(c);
+     avcodec_free_context(&c);
 -    av_frame_free(&picture);
 +    av_frame_free(&frame);
      printf("\n");
  }