[SCM] libav/experimental: Fix crash when using iblock option (when a warning is logged).

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit da7548585e1ed0fdb1c337c2f07ab313c99122a5
Author: James Zern <jzern at google.com>
Date:   Thu Oct 14 07:47:49 2010 +0000

    Fix crash when using iblock option (when a warning is logged).
    
    Patch by James Zern, jzern google
    
    Originally committed as revision 25472 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/libvorbis.c b/libavcodec/libvorbis.c
index ab4b425..b7466cd 100644
--- a/libavcodec/libvorbis.c
+++ b/libavcodec/libvorbis.c
@@ -58,7 +58,7 @@ static const AVOption options[]={
 {"iblock", "Sets the impulse block bias", offsetof(OggVorbisContext, iblock), FF_OPT_TYPE_DOUBLE, 0, -15, 0, AV_OPT_FLAG_ENCODING_PARAM},
 {NULL}
 };
-static const AVClass class = { "libvorbis", NULL, options, LIBAVUTIL_VERSION_INT };
+static const AVClass class = { "libvorbis", av_default_item_name, options, LIBAVUTIL_VERSION_INT };
 
 static av_cold int oggvorbis_init_encoder(vorbis_info *vi, AVCodecContext *avccontext) {
     OggVorbisContext *context = avccontext->priv_data ;

-- 
Libav/FFmpeg packaging