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/vocenc.c | |
| parent | 71375e05006e68fecdeb8d5fa80c3cce52a5cf86 (diff) | |
| download | ffmpeg-dd1c8f3e6e5380f993c86750bb09fd42e130143f.tar.gz | |
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/vocenc.c')
| -rw-r--r-- | libavformat/vocenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/vocenc.c b/libavformat/vocenc.c index 0802f50e62..4badb1d533 100644 --- a/libavformat/vocenc.c +++ b/libavformat/vocenc.c @@ -55,7 +55,7 @@ static int voc_write_packet(AVFormatContext *s, AVPacket *pkt) put_byte(pb, VOC_TYPE_NEW_VOICE_DATA); put_le24(pb, pkt->size + 12); put_le32(pb, enc->sample_rate); - put_byte(pb, enc->bits_per_sample); + put_byte(pb, enc->bits_per_coded_sample); put_byte(pb, enc->channels); put_le16(pb, enc->codec_tag); put_le32(pb, 0); |