[Ffmpeg-cvslog] r6411 - trunk/libavformat/avisynth.c

[gpoirier]

Author: gpoirier
Date: Sun Oct  1 22:41:02 2006
New Revision: 6411

Modified:
   trunk/libavformat/avisynth.c

Log:
add support for some MS DIB formats for avisynth
Patch by Steve Lhomme % slhomme AH divxcorp P com %
Original thread:
Date: Sep 27, 2006 7:20 PM
Subject: [Ffmpeg-devel] [PATCH] AVISynth support for some MS DIB formats


Modified: trunk/libavformat/avisynth.c
==============================================================================
--- trunk/libavformat/avisynth.c	(original)
+++ trunk/libavformat/avisynth.c	Sun Oct  1 22:41:02 2006
@@ -94,6 +94,7 @@
                   stream->chunck_samples = wvfmt.nSamplesPerSec * (uint64_t)info.dwScale / (uint64_t)info.dwRate;
                   stream->chunck_size = stream->chunck_samples * wvfmt.nChannels * wvfmt.wBitsPerSample / 8;
 
+                  st->codec->codec_tag = wvfmt.wFormatTag;
                   st->codec->codec_id = wav_codec_get_id(wvfmt.wFormatTag, st->codec->bits_per_sample);
                 }
               else if (stream->info.fccType == streamtypeVIDEO)
@@ -115,9 +116,10 @@
                   st->codec->width = imgfmt.bmiHeader.biWidth;
                   st->codec->height = imgfmt.bmiHeader.biHeight;
 
-                  st->codec->bits_per_sample = stream->info.dwSampleSize * 8;
+                  st->codec->bits_per_sample = imgfmt.bmiHeader.biBitCount;
                   st->codec->bit_rate = (uint64_t)stream->info.dwSampleSize * (uint64_t)stream->info.dwRate * 8 / (uint64_t)stream->info.dwScale;
-                  st->codec->codec_id = codec_get_id(codec_bmp_tags, stream->info.fccHandler);
+                  st->codec->codec_tag = imgfmt.bmiHeader.biCompression;
+                  st->codec->codec_id = codec_get_id(codec_bmp_tags, imgfmt.bmiHeader.biCompression);
 
                   st->duration = stream->info.dwLength;
                 }
@@ -128,7 +130,6 @@
                 }
 
               avs->nb_streams++;
-              st->codec->codec_tag = stream->info.fccHandler;
 
               st->codec->stream_codec_tag = stream->info.fccHandler;