Merge commit '555000c7d5c1e13043a948ebc48d2939b0ba6536'

* commit '555000c7d5c1e13043a948ebc48d2939b0ba6536':
  h264: check that DPB is allocated before accessing it in flush_dpb()
  vf_hqdn3d: fix uninitialized variable use
  vf_gradfun: fix uninitialized variable use

Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/h264.c

@@ -2685,8 +2685,9 @@ static void flush_dpb(AVCodecContext *avctx)
 
     flush_change(h);
 
-    for (i = 0; i < MAX_PICTURE_COUNT; i++)
-        unref_picture(h, &h->DPB[i]);
+    if (h->DPB)
+        for (i = 0; i < MAX_PICTURE_COUNT; i++)
+            unref_picture(h, &h->DPB[i]);
     h->cur_pic_ptr = NULL;
     unref_picture(h, &h->cur_pic);
 

libavfilter/vf_gradfun.c

@@ -202,12 +202,13 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
     GradFunContext *gf = inlink->dst->priv;
     AVFilterLink *outlink = inlink->dst->outputs[0];
     AVFrame *out;
-    int p, direct = 0;
+    int p, direct;
 
     if (av_frame_is_writable(in)) {
         direct = 1;
         out = in;
     } else {
+        direct = 0;
         out = ff_get_video_buffer(outlink, outlink->w, outlink->h);
         if (!out) {
             av_frame_free(&in);

libavfilter/vf_hqdn3d.c

@@ -310,12 +310,13 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
     AVFilterLink *outlink = inlink->dst->outputs[0];
 
     AVFrame *out;
-    int direct = 0, c;
+    int direct, c;
 
     if (av_frame_is_writable(in)) {
         direct = 1;
         out = in;
     } else {
+        direct = 0;
         out = ff_get_video_buffer(outlink, outlink->w, outlink->h);
         if (!out) {
             av_frame_free(&in);