[FFmpeg-cvslog] r23999 - trunk/libavformat/avidec.c

[michael]

Author: michael
Date: Fri Jul  2 17:09:27 2010
New Revision: 23999

Log:
Duplicate rounding that MS does in one of their implementations of an avi demuxer.
Fixes issue740
Based on patch by Cory Fields theuni-nospam- >xbmc @org

Modified:
   trunk/libavformat/avidec.c

Modified: trunk/libavformat/avidec.c
==============================================================================
--- trunk/libavformat/avidec.c	Fri Jul  2 17:00:21 2010	(r23998)
+++ trunk/libavformat/avidec.c	Fri Jul  2 17:09:27 2010	(r23999)
@@ -48,6 +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
 } AVIStream;
 
 typedef struct {
@@ -92,6 +93,8 @@ static void print_tag(const char *str, u
 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
         return 1;
 }
@@ -569,6 +572,7 @@ static int avi_read_header(AVFormatConte
                     break;
                 case AVMEDIA_TYPE_AUDIO:
                     ff_get_wav_header(pb, st->codec, size);
+                    ast->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;