diff options
author | Luca Abeni | 2008-09-08 14:24:59 +0000 |
---|---|---|
committer | Michael Niedermayer | 2008-09-08 14:24:59 +0000 |
commit | dd1c8f3e6e5380f993c86750bb09fd42e130143f (patch) | |
tree | 2ae5b2bbda1b685069f4db6ed408097288590dde /libavformat/avs.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/avs.c')
-rw-r--r-- | libavformat/avs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/avs.c b/libavformat/avs.c index 16be4dc617..6fcb230100 100644 --- a/libavformat/avs.c +++ b/libavformat/avs.c @@ -182,7 +182,7 @@ static int avs_read_packet(AVFormatContext * s, AVPacket * pkt) avs->st_video->codec->codec_id = CODEC_ID_AVS; avs->st_video->codec->width = avs->width; avs->st_video->codec->height = avs->height; - avs->st_video->codec->bits_per_sample=avs->bits_per_sample; + avs->st_video->codec->bits_per_coded_sample=avs->bits_per_sample; avs->st_video->nb_frames = avs->nb_frames; avs->st_video->codec->time_base = (AVRational) { 1, avs->fps}; |