# HG changeset patch # User lu_zero # Date 1157051640 0 # Node ID 7e1ee254a3ee02a67384cce0dc7927a0742175eb # Parent dd55fb216497f626d954a29dc0838c02907e0a0a 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 diff -r dd55fb216497 -r 7e1ee254a3ee avcodec.h --- 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); diff -r dd55fb216497 -r 7e1ee254a3ee dsputil.h --- a/dsputil.h Thu Aug 31 15:44:37 2006 +0000 +++ b/dsputil.h Thu Aug 31 19:14:00 2006 +0000 @@ -323,7 +323,7 @@ void (*vector_fmul_add_add)(float *dst, const float *src0, const float *src1, const float *src2, int src3, int len, int step); /* C version: convert floats from the range [384.0,386.0] to ints in [-32768,32767] - * asm versions: convert floats from [-32768.0,32767.0] without rescaling */ + * simd versions: convert floats from [-32768.0,32767.0] without rescaling and arrays are 16byte aligned */ void (*float_to_int16)(int16_t *dst, const float *src, int len); /* (I)DCT */