diff options
| author | Luca Abeni <lucabe72@email.it> | 2008-09-08 14:24:59 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2008-09-08 14:24:59 +0000 |
| commit | dd1c8f3e6e5380f993c86750bb09fd42e130143f (patch) | |
| tree | 2ae5b2bbda1b685069f4db6ed408097288590dde /libavformat/vocdec.c | |
| parent | 71375e05006e68fecdeb8d5fa80c3cce52a5cf86 (diff) | |
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!
Originally committed as revision 15262 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/vocdec.c')
| -rw-r--r-- | libavformat/vocdec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/vocdec.c b/libavformat/vocdec.c index 178ecb5ac6..7aec2ab6df 100644 --- a/libavformat/vocdec.c +++ b/libavformat/vocdec.c @@ -84,7 +84,7 @@ voc_get_packet(AVFormatContext *s, AVPacket *pkt, AVStream *st, int max_size) dec->sample_rate = sample_rate; dec->channels = channels; dec->codec_id = codec_get_id(ff_voc_codec_tags, get_byte(pb)); - dec->bits_per_sample = av_get_bits_per_sample(dec->codec_id); + dec->bits_per_coded_sample = av_get_bits_per_sample(dec->codec_id); voc->remaining_size -= 2; max_size -= 2; channels = 1; @@ -104,7 +104,7 @@ voc_get_packet(AVFormatContext *s, AVPacket *pkt, AVStream *st, int max_size) case VOC_TYPE_NEW_VOICE_DATA: dec->sample_rate = get_le32(pb); - dec->bits_per_sample = get_byte(pb); + dec->bits_per_coded_sample = get_byte(pb); dec->channels = get_byte(pb); dec->codec_id = codec_get_id(ff_voc_codec_tags, get_le16(pb)); url_fskip(pb, 4); @@ -120,7 +120,7 @@ voc_get_packet(AVFormatContext *s, AVPacket *pkt, AVStream *st, int max_size) } } - dec->bit_rate = dec->sample_rate * dec->bits_per_sample; + dec->bit_rate = dec->sample_rate * dec->bits_per_coded_sample; if (max_size <= 0) max_size = 2048; |