Rename block_align variable in the avi demuxer to clearly seperate its purpose
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 2 Jul 2010 23:33:10 +0000 (23:33 +0000)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 2 Jul 2010 23:33:10 +0000 (23:33 +0000)
from the true block_align.

Originally committed as revision 24011 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavformat/avidec.c

index 0341f18..ec24a6e 100644 (file)
@@ -48,7 +48,7 @@ typedef struct AVIStream {
     int prefix_count;
     uint32_t pal[256];
     int has_pal;
-    int block_align;                  ///< AVCodecContext.block_align copied here for easier access
+    int dshow_block_align;            ///< block align variable used to emulate bugs in the MS dshow demuxer
 } AVIStream;
 
 typedef struct {
@@ -93,8 +93,8 @@ static void print_tag(const char *str, unsigned int tag, int size)
 static inline int get_duration(AVIStream *ast, int len){
     if(ast->sample_size){
         return len;
-    }else if (ast->block_align){
-        return (len + ast->block_align - 1)/ast->block_align;
+    }else if (ast->dshow_block_align){
+        return (len + ast->dshow_block_align - 1)/ast->dshow_block_align;
     }else
         return 1;
 }
@@ -572,7 +572,7 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap)
                     break;
                 case AVMEDIA_TYPE_AUDIO:
                     ff_get_wav_header(pb, st->codec, size);
-                    ast->block_align= st->codec->block_align;
+                    ast->dshow_block_align= st->codec->block_align;
                     if(ast->sample_size && st->codec->block_align && ast->sample_size != st->codec->block_align){
                         av_log(s, AV_LOG_WARNING, "sample size (%d) != block align (%d)\n", ast->sample_size, st->codec->block_align);
                         ast->sample_size= st->codec->block_align;