[SCM] libav/experimental: set block align in av_write_header if not set, fix issue #489

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit bf912a482b01ce0c0b5396bf5ce92fc891fd7d73
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Mon Sep 8 19:37:22 2008 +0000

    set block align in av_write_header if not set, fix issue #489
    
    Originally committed as revision 15277 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/utils.c b/libavformat/utils.c
index e82324f..c124507 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -2444,6 +2444,9 @@ int av_write_header(AVFormatContext *s)
                 av_log(s, AV_LOG_ERROR, "sample rate not set\n");
                 return -1;
             }
+            if(!st->codec->block_align)
+                st->codec->block_align = st->codec->channels *
+                    av_get_bits_per_sample(st->codec->codec_id) >> 3;
             break;
         case CODEC_TYPE_VIDEO:
             if(st->codec->time_base.num<=0 || st->codec->time_base.den<=0){ //FIXME audio too?

-- 
Libav/FFmpeg packaging