Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Sep 2012 11:55:43 +0000 (13:55 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Sep 2012 11:55:43 +0000 (13:55 +0200)
* qatar/master:
  avcodec: fix memleak in avcodec_encode_audio2()

Conflicts:
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/utils.c

@@@ -1169,8 -982,8 +1169,9 @@@ int attribute_align_arg avcodec_encode_
              }
  
              if (frame->nb_samples != avctx->frame_size) {
-                 return AVERROR(EINVAL);
 +                av_log(avctx, AV_LOG_ERROR, "nb_samples (%d) != frame_size (%d) (avcodec_encode_audio2)\n", frame->nb_samples, avctx->frame_size);
+                 ret = AVERROR(EINVAL);
+                 goto end;
              }
          }
      }