diff avidec.c @ 3908:1d3d17de20ba libavformat

Bump Major version, this commit is almost just renaming bits_per_sample to bits_per_coded_sample but that cannot be done seperately. Patch by Luca Abeni Also reset the minor version and fix the forgotton change to libfaad. Note: The API/ABI should not be considered stable yet, there still may be a change done here or there if some developer has some cleanup ideas and patches!
author michael
date Mon, 08 Sep 2008 14:24:59 +0000
parents 27537074f2a9
children 549a09cf23fe
line wrap: on
line diff
--- a/avidec.c	Mon Sep 08 00:58:24 2008 +0000
+++ b/avidec.c	Mon Sep 08 14:24:59 2008 +0000
@@ -445,7 +445,7 @@
                     st->codec->width = get_le32(pb);
                     st->codec->height = get_le32(pb);
                     get_le16(pb); /* panes */
-                    st->codec->bits_per_sample= get_le16(pb); /* depth */
+                    st->codec->bits_per_coded_sample= get_le16(pb); /* depth */
                     tag1 = get_le32(pb);
                     get_le32(pb); /* ImageSize */
                     get_le32(pb); /* XPelsPerMeter */
@@ -472,7 +472,7 @@
                     /* Extract palette from extradata if bpp <= 8. */
                     /* This code assumes that extradata contains only palette. */
                     /* This is true for all paletted codecs implemented in FFmpeg. */
-                    if (st->codec->extradata_size && (st->codec->bits_per_sample <= 8)) {
+                    if (st->codec->extradata_size && (st->codec->bits_per_coded_sample <= 8)) {
                         st->codec->palctrl = av_mallocz(sizeof(AVPaletteControl));
 #ifdef WORDS_BIGENDIAN
                         for (i = 0; i < FFMIN(st->codec->extradata_size, AVPALETTE_SIZE)/4; i++)