diff options
author | Benjamin Larsson <banan@ludd.ltu.se> | 2005-12-09 16:08:18 +0000 |
---|---|---|
committer | Roberto Togni <r_togni@tiscali.it> | 2005-12-09 16:08:18 +0000 |
commit | e0f7e3297073e341b43522d67ad717a3d568cd3c (patch) | |
tree | 4251f14d6f4e6dfa54f6b0fb73fc9c4a81cdb4e9 /libavcodec/avcodec.h | |
parent | 60d76256cb6abb7a5f65e434031d0ebb114599ea (diff) | |
download | ffmpeg-e0f7e3297073e341b43522d67ad717a3d568cd3c.tar.gz |
Cook compatibe decoder, patch by Benjamin Larsson
Add cook demucing, change rm demuxer so that it reorders audio packets
before sending them to the decoder, and send minimum decodeable sized
packets; pass only real codec extradata fo the decoder
Fix 28_8 decoder for the new demuxer strategy
Originally committed as revision 4726 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/avcodec.h')
-rw-r--r-- | libavcodec/avcodec.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index ede77ead48..7cf7f979fb 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -21,8 +21,8 @@ extern "C" { #define AV_STRINGIFY(s) AV_TOSTRING(s) #define AV_TOSTRING(s) #s -#define LIBAVCODEC_VERSION_INT ((50<<16)+(1<<8)+0) -#define LIBAVCODEC_VERSION 50.1.0 +#define LIBAVCODEC_VERSION_INT ((51<<16)+(0<<8)+0) +#define LIBAVCODEC_VERSION 51.0.0 #define LIBAVCODEC_BUILD LIBAVCODEC_VERSION_INT #define LIBAVCODEC_IDENT "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION) @@ -187,6 +187,7 @@ enum CodecID { CODEC_ID_WESTWOOD_SND1, CODEC_ID_GSM, CODEC_ID_QDM2, + CODEC_ID_COOK, CODEC_ID_OGGTHEORA= 0x16000, @@ -2004,6 +2005,7 @@ extern AVCodec mp3_decoder; extern AVCodec mp3adu_decoder; extern AVCodec mp3on4_decoder; extern AVCodec qdm2_decoder; +extern AVCodec cook_decoder; extern AVCodec mace3_decoder; extern AVCodec mace6_decoder; extern AVCodec huffyuv_decoder; |