From 00adc1e5dc4f5f310ade5acc19ffdde78b0ed51d Mon Sep 17 00:00:00 2001
From: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Date: Tue, 9 Sep 2008 18:32:50 +0000
Subject: [PATCH] set bits_per_coded_sample according to new lavc api
Originally committed as revision 15289 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavdevice/vfwcap.c | 2 +-
libavformat/avisynth.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/libavdevice/vfwcap.c b/libavdevice/vfwcap.c
index be6003a4228..34e33c2e906 100644
--- a/libavdevice/vfwcap.c
+++ b/libavdevice/vfwcap.c
@@ -370,7 +370,7 @@ static int vfw_read_header(AVFormatContext *s, AVFormatParameters *ap)
codec->codec_id = CODEC_ID_RAWVIDEO;
codec->pix_fmt = vfw_pixfmt(biCompression, biBitCount);
if(biCompression == BI_RGB)
- codec->bits_per_sample = biBitCount;
+ codec->bits_per_coded_sample = biBitCount;
av_set_pts_info(st, 32, 1, 1000);
diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c
index fdb8efa7656..88e841c793c 100644
--- a/libavformat/avisynth.c
+++ b/libavformat/avisynth.c
@@ -91,13 +91,13 @@ static int avisynth_read_header(AVFormatContext *s, AVFormatParameters *ap)
st->codec->channels = wvfmt.nChannels;
st->codec->sample_rate = wvfmt.nSamplesPerSec;
st->codec->bit_rate = wvfmt.nAvgBytesPerSec * 8;
- st->codec->bits_per_sample = wvfmt.wBitsPerSample;
+ st->codec->bits_per_coded_sample = wvfmt.wBitsPerSample;
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);
+ st->codec->codec_id = wav_codec_get_id(wvfmt.wFormatTag, st->codec->bits_per_coded_sample);
}
else if (stream->info.fccType == streamtypeVIDEO)
{
@@ -118,7 +118,7 @@ static int avisynth_read_header(AVFormatContext *s, AVFormatParameters *ap)
st->codec->width = imgfmt.bmiHeader.biWidth;
st->codec->height = imgfmt.bmiHeader.biHeight;
- st->codec->bits_per_sample = imgfmt.bmiHeader.biBitCount;
+ st->codec->bits_per_coded_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_tag = imgfmt.bmiHeader.biCompression;
st->codec->codec_id = codec_get_id(codec_bmp_tags, imgfmt.bmiHeader.biCompression);
--
GitLab