highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bump Major version, this commit is almost just renaming bits_per_sample to

Browse Source 
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
This commit is contained in:
Luca Abeni
2008-09-08 14:24:59 +00:00
committed by Michael Niedermayer
parent 71375e0500
commit dd1c8f3e6e
71 changed files with 206 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/mmf.c
View File

@@ -248,8 +248,8 @@ static int mmf_read_header(AVFormatContext *s,
st->codec->codec_id = CODEC_ID_ADPCM_YAMAHA;
st->codec->sample_rate = rate;
st->codec->channels = 1;
st->codec->bits_per_sample = 4;
st->codec->bit_rate = st->codec->sample_rate * st->codec->bits_per_sample;
st->codec->bits_per_coded_sample = 4;
st->codec->bit_rate = st->codec->sample_rate * st->codec->bits_per_coded_sample;
av_set_pts_info(st, 64, 1, st->codec->sample_rate);