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 /libavcodec/utils.c | |
parent | 71375e05006e68fecdeb8d5fa80c3cce52a5cf86 (diff) | |
download | ffmpeg-streaming-dd1c8f3e6e5380f993c86750bb09fd42e130143f.zip ffmpeg-streaming-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 'libavcodec/utils.c')
-rw-r--r-- | libavcodec/utils.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index b13cf37..a6dc5d8 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -544,7 +544,6 @@ static const AVOption options[]={ {"scplx_mask", "spatial complexity masking", OFFSET(spatial_cplx_masking), FF_OPT_TYPE_FLOAT, 0, -FLT_MAX, FLT_MAX, V|E}, {"p_mask", "inter masking", OFFSET(p_masking), FF_OPT_TYPE_FLOAT, 0, -FLT_MAX, FLT_MAX, V|E}, {"dark_mask", "compresses dark areas stronger than medium ones", OFFSET(dark_masking), FF_OPT_TYPE_FLOAT, 0, -FLT_MAX, FLT_MAX, V|E}, -{"unused", NULL, OFFSET(unused), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX}, {"idct", "select IDCT implementation", OFFSET(idct_algo), FF_OPT_TYPE_INT, DEFAULT, 0, INT_MAX, V|E|D, "idct"}, {"auto", NULL, 0, FF_OPT_TYPE_CONST, FF_IDCT_AUTO, INT_MIN, INT_MAX, V|E|D, "idct"}, {"int", NULL, 0, FF_OPT_TYPE_CONST, FF_IDCT_INT, INT_MIN, INT_MAX, V|E|D, "idct"}, |