Mercurial > libavcodec.hg
diff avcodec.h @ 1116:86a5d0ce86bf libavcodec
merging fourcc with codec_tag
author | michaelni |
---|---|
date | Sat, 08 Mar 2003 01:40:52 +0000 |
parents | e4762efc3617 |
children | 8248e652d64e |
line wrap: on
line diff
--- a/avcodec.h Fri Mar 07 13:49:10 2003 +0000 +++ b/avcodec.h Sat Mar 08 01:40:52 2003 +0000 @@ -15,8 +15,8 @@ #define LIBAVCODEC_VERSION_INT 0x000406 #define LIBAVCODEC_VERSION "0.4.6" -#define LIBAVCODEC_BUILD 4660 -#define LIBAVCODEC_BUILD_STR "4660" +#define LIBAVCODEC_BUILD 4661 +#define LIBAVCODEC_BUILD_STR "4661" enum CodecID { CODEC_ID_NONE, @@ -535,10 +535,10 @@ /** * number of bits used for the previously encoded frame. * - encoding: set by lavc - * - decoding: - for audio - bits_per_sample + * - decoding: unused */ int frame_bits; - + /** * private data of the user, can be used to carry app specific stuff. * - encoding: set by user @@ -549,7 +549,14 @@ char codec_name[32]; enum CodecType codec_type; /* see CODEC_TYPE_xxx */ enum CodecID codec_id; /* see CODEC_ID_xxx */ - unsigned int codec_tag; ///< codec tag, only used if unknown codec + + /** + * fourcc (LSB first, so "ABCD" -> ('D'<<24) + ('C'<<16) + ('B'<<8) + 'A'). + * this is used to workaround some encoder bugs + * - encoding: unused + * - decoding: set by user, will be converted to upper case by lavc during init + */ + unsigned int codec_tag; /** * workaround bugs in encoders which sometimes cannot be detected automatically. @@ -783,14 +790,6 @@ float dark_masking; /** - * fourcc (LSB first, so "ABCD" -> ('D'<<24) + ('C'<<16) + ('B'<<8) + 'A'). - * this is used to workaround some encoder bugs - * - encoding: unused - * - decoding: set by user, will be converted to upper case by lavc during init - */ - int fourcc; - - /** * idct algorithm, see FF_IDCT_* below. * - encoding: set by user * - decoding: set by user