diff options
| author | Mike Melanson <mike@multimedia.cx> | 2006-08-02 07:02:37 +0000 |
|---|---|---|
| committer | Mike Melanson <mike@multimedia.cx> | 2006-08-02 07:02:37 +0000 |
| commit | 5f24c84bddd59e2d1744408f2c3694050d7d3d3d (patch) | |
| tree | 044d31ff791ca6d0d60b5624bd31554f7da53876 /src/libffmpeg/libavcodec/adx.c | |
| parent | feaf0357aaa9f80562900ad9c50b9adf44d9b795 (diff) | |
| download | xine-lib-5f24c84bddd59e2d1744408f2c3694050d7d3d3d.tar.gz xine-lib-5f24c84bddd59e2d1744408f2c3694050d7d3d3d.tar.bz2 | |
sync to FFmpeg 51.11.0
CVS patchset: 8146
CVS date: 2006/08/02 07:02:37
Diffstat (limited to 'src/libffmpeg/libavcodec/adx.c')
| -rw-r--r-- | src/libffmpeg/libavcodec/adx.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libffmpeg/libavcodec/adx.c b/src/libffmpeg/libavcodec/adx.c index c841e4eb8..c8c785590 100644 --- a/src/libffmpeg/libavcodec/adx.c +++ b/src/libffmpeg/libavcodec/adx.c @@ -267,7 +267,7 @@ static uint32_t read_long(const unsigned char *p) return (p[0]<<24)|(p[1]<<16)|(p[2]<<8)|p[3]; } -int is_adx(const unsigned char *buf,size_t bufsize) +static int is_adx(const unsigned char *buf,size_t bufsize) { int offset; @@ -385,8 +385,8 @@ static int adx_decode_frame(AVCodecContext *avctx, } #ifdef CONFIG_ENCODERS -AVCodec adx_adpcm_encoder = { - "adx_adpcm", +AVCodec adpcm_adx_encoder = { + "adpcm_adx", CODEC_TYPE_AUDIO, CODEC_ID_ADPCM_ADX, sizeof(ADXContext), @@ -397,8 +397,8 @@ AVCodec adx_adpcm_encoder = { }; #endif //CONFIG_ENCODERS -AVCodec adx_adpcm_decoder = { - "adx_adpcm", +AVCodec adpcm_adx_decoder = { + "adpcm_adx", CODEC_TYPE_AUDIO, CODEC_ID_ADPCM_ADX, sizeof(ADXContext), |