Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavfilter / lavfutils.c

diff --git a/libavfilter/lavfutils.c b/libavfilter/lavfutils.c
index 70f7e7169aa807c019ef6dd5c37232097accc9b3..8b6b1145fc1d1ef61234dab86e26e607b8ec8aee 100644 (file)
--- a/libavfilter/lavfutils.c
+++ b/libavfilter/lavfutils.c
@@ -22,7 +22,7 @@
 #include "lavfutils.h"
 
 int ff_load_image(uint8_t *data[4], int linesize[4],
-                  int *w, int *h, enum PixelFormat *pix_fmt,
+                  int *w, int *h, enum AVPixelFormat *pix_fmt,
                   const char *filename, void *log_ctx)
 {
     AVInputFormat *iformat = NULL;
@@ -85,10 +85,8 @@ int ff_load_image(uint8_t *data[4], int linesize[4],
     av_image_copy(data, linesize, (const uint8_t **)frame->data, frame->linesize, *pix_fmt, *w, *h);
 
 end:
-    if (codec_ctx)
-        avcodec_close(codec_ctx);
-    if (format_ctx)
-        avformat_close_input(&format_ctx);
+    avcodec_close(codec_ctx);
+    avformat_close_input(&format_ctx);
     av_freep(&frame);
 
     if (ret < 0)