diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-26 12:39:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-26 12:39:26 +0100 |
| commit | 13fa074173269308f5051bb1a683c9ed54ab8735 (patch) | |
| tree | cd4fa30b5b54e7dbc38b4c9cb7d5708ff5b91824 /libavcodec/vorbis.h | |
| parent | 2b277f2992d66b7f02fdf8d3642c326087d362a9 (diff) | |
| parent | e951b6d94c441d46b396ef12da1428297d77251d (diff) | |
Merge commit 'e951b6d94c441d46b396ef12da1428297d77251d'
* commit 'e951b6d94c441d46b396ef12da1428297d77251d':
vorbisdec: cosmetics: rename variable avccontext to avctx
configure: Identify icc compiler with a less ambiguous pattern
Conflicts:
libavcodec/vorbisdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vorbis.h')
| -rw-r--r-- | libavcodec/vorbis.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vorbis.h b/libavcodec/vorbis.h index a8309241c2..98dd14f9d4 100644 --- a/libavcodec/vorbis.h +++ b/libavcodec/vorbis.h @@ -36,7 +36,7 @@ typedef struct vorbis_floor1_entry { uint16_t high; } vorbis_floor1_entry; -int ff_vorbis_ready_floor1_list(AVCodecContext *avccontext, +int ff_vorbis_ready_floor1_list(AVCodecContext *avctx, vorbis_floor1_entry *list, int values); unsigned int ff_vorbis_nth_root(unsigned int x, unsigned int n); // x^(1/n) int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, unsigned num); |