diff options
author | Luca Abeni <lucabe72@email.it> | 2008-09-08 18:24:59 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2008-09-08 18:24:59 +0400 |
commit | dd1c8f3e6e5380f993c86750bb09fd42e130143f (patch) | |
tree | 2ae5b2bbda1b685069f4db6ed408097288590dde /libavformat/electronicarts.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/electronicarts.c')
-rw-r--r-- | libavformat/electronicarts.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/electronicarts.c b/libavformat/electronicarts.c index 2e627792c3..09da524ffd 100644 --- a/libavformat/electronicarts.c +++ b/libavformat/electronicarts.c @@ -411,10 +411,10 @@ static int ea_read_header(AVFormatContext *s, st->codec->codec_tag = 0; /* no tag */ st->codec->channels = ea->num_channels; st->codec->sample_rate = ea->sample_rate; - st->codec->bits_per_sample = ea->bytes * 8; + st->codec->bits_per_coded_sample = ea->bytes * 8; st->codec->bit_rate = st->codec->channels * st->codec->sample_rate * - st->codec->bits_per_sample / 4; - st->codec->block_align = st->codec->channels*st->codec->bits_per_sample; + st->codec->bits_per_coded_sample / 4; + st->codec->block_align = st->codec->channels*st->codec->bits_per_coded_sample; ea->audio_stream_index = st->index; ea->audio_frame_counter = 0; } |