[SCM] libav/experimental: Make avpicture_alloc() return meaningful values.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 6d34323ee65f63084309ba05b09c8c2a0fca9924
Author: Stefano Sabatini <stefano.sabatini-lala at poste.it>
Date:   Wed Dec 8 10:24:09 2010 +0000

    Make avpicture_alloc() return meaningful values.
    
    Originally committed as revision 25922 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c
index 165ba9e..3c14361 100644
--- a/libavcodec/imgconvert.c
+++ b/libavcodec/imgconvert.c
@@ -813,9 +813,11 @@ void ff_shrink88(uint8_t *dst, int dst_wrap,
 int avpicture_alloc(AVPicture *picture,
                     enum PixelFormat pix_fmt, int width, int height)
 {
-    if (av_image_alloc(picture->data, picture->linesize, width, height, pix_fmt, 0) < 0) {
+    int ret;
+
+    if ((ret = av_image_alloc(picture->data, picture->linesize, width, height, pix_fmt, 0)) < 0) {
         memset(picture, 0, sizeof(AVPicture));
-        return -1;
+        return ret;
     }
 
     return 0;

-- 
Libav/FFmpeg packaging