Mercurial > libavcodec.hg
diff avcodec.h @ 3660:7e1ee254a3ee libavcodec
Align the input buffer in ffplay, introduce a public macro for aligned declarations
Update the avcodec_decode_audio and the float_to_int16 descriptions accordingly
author | lu_zero |
---|---|
date | Thu, 31 Aug 2006 19:14:00 +0000 |
parents | d2936fc9558c |
children | 18b13b923616 |
line wrap: on
line diff
--- a/avcodec.h Thu Aug 31 15:44:37 2006 +0000 +++ b/avcodec.h Thu Aug 31 19:14:00 2006 +0000 @@ -17,8 +17,8 @@ #define AV_STRINGIFY(s) AV_TOSTRING(s) #define AV_TOSTRING(s) #s -#define LIBAVCODEC_VERSION_INT ((51<<16)+(11<<8)+0) -#define LIBAVCODEC_VERSION 51.11.0 +#define LIBAVCODEC_VERSION_INT ((51<<16)+(12<<8)+0) +#define LIBAVCODEC_VERSION 51.12.0 #define LIBAVCODEC_BUILD LIBAVCODEC_VERSION_INT #define LIBAVCODEC_IDENT "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION) @@ -2451,6 +2451,17 @@ */ int avcodec_open(AVCodecContext *avctx, AVCodec *codec); +/** + * Decode an audio frame. + * + * @param avctx the codec context. + * @param samples output buffer, 16 byte aligned + * @param frame_size_ptr the output buffer size in bytes, zero if no frame could be compressed + * @param buf input buffer, 16 byte aligned + * @param buf_size the input buffer size + * @return 0 if successful, -1 if not. + */ + int avcodec_decode_audio(AVCodecContext *avctx, int16_t *samples, int *frame_size_ptr, uint8_t *buf, int buf_size);