Mercurial > libavformat.hg

changeset 6221:b9bf2d18f51e libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author michael
date Fri, 02 Jul 2010 15:09:27 +0000
parents 9b579e53bd03
children 0bc4c96a5aea
files avidec.c
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/avidec.c	Fri Jul 02 12:50:19 2010 +0000
+++ b/avidec.c	Fri Jul 02 15:09:27 2010 +0000
@@ -48,6 +48,7 @@
     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 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 @@
                     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;