Merge remote-tracking branch 'qatar/release/9' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 18 Mar 2013 02:11:58 +0000 (03:11 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 18 Mar 2013 02:11:58 +0000 (03:11 +0100)
* qatar/release/9:
  hqdn3d: Fix out of array read in LOWPASS
  vf_gradfun: fix uninitialized variable use

Conflicts:
libavfilter/vf_hqdn3d.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavfilter/vf_gradfun.c
libavfilter/vf_hqdn3d.c

@@@ -201,9 -187,9 +201,9 @@@ static int filter_frame(AVFilterLink *i
      GradFunContext *gf = inlink->dst->priv;
      AVFilterLink *outlink = inlink->dst->outputs[0];
      AVFilterBufferRef *out;
-     int p, direct = 0;
+     int p, direct;
  
 -    if ((in->perms & AV_PERM_WRITE) && !(in->perms & AV_PERM_PRESERVE)) {
 +    if (in->perms & AV_PERM_WRITE) {
          direct = 1;
          out = in;
      } else {
Simple merge