[SCM] libav/experimental: Provide non null class name to avoid crash with ffmpeg -h.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit f15e6b869fc1ff3ffef1b1ac7b394e2155b5fafe
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Mon Mar 3 19:53:27 2008 +0000

    Provide non null class name to avoid crash with ffmpeg -h.
    
    Originally committed as revision 12300 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/imgresample.c b/libavcodec/imgresample.c
index c481e9d..e2cc0c2 100644
--- a/libavcodec/imgresample.c
+++ b/libavcodec/imgresample.c
@@ -512,6 +512,8 @@ void img_resample_close(ImgReSampleContext *s)
     av_free(s);
 }
 
+static const AVClass context_class = { "imgresample", NULL, NULL };
+
 struct SwsContext *sws_getContext(int srcW, int srcH, int srcFormat,
                                   int dstW, int dstH, int dstFormat,
                                   int flags, SwsFilter *srcFilter,
@@ -520,13 +522,12 @@ struct SwsContext *sws_getContext(int srcW, int srcH, int srcFormat,
     struct SwsContext *ctx;
 
     ctx = av_malloc(sizeof(struct SwsContext));
-    if (ctx)
-        ctx->av_class = av_mallocz(sizeof(AVClass));
-    if (!ctx || !ctx->av_class) {
+    if (!ctx) {
         av_log(NULL, AV_LOG_ERROR, "Cannot allocate a resampling context!\n");
 
         return NULL;
     }
+    ctx->av_class = &context_class;
 
     if ((srcH != dstH) || (srcW != dstW)) {
         if ((srcFormat != PIX_FMT_YUV420P) || (dstFormat != PIX_FMT_YUV420P)) {

-- 
Libav/FFmpeg packaging