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.c | |
| parent | 2b277f2992d66b7f02fdf8d3642c326087d362a9 (diff) | |
| parent | e951b6d94c441d46b396ef12da1428297d77251d (diff) | |
| download | ffmpeg-13fa074173269308f5051bb1a683c9ed54ab8735.tar.gz | |
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.c')
| -rw-r--r-- | libavcodec/vorbis.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/vorbis.c b/libavcodec/vorbis.c index adf08b5fb9..6eb765d7d0 100644 --- a/libavcodec/vorbis.c +++ b/libavcodec/vorbis.c @@ -121,7 +121,7 @@ int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, unsigned num) return 0; } -int ff_vorbis_ready_floor1_list(AVCodecContext *avccontext, +int ff_vorbis_ready_floor1_list(AVCodecContext *avctx, vorbis_floor1_entry *list, int values) { int i; @@ -147,7 +147,7 @@ int ff_vorbis_ready_floor1_list(AVCodecContext *avccontext, int j; for (j = i + 1; j < values; j++) { if (list[i].x == list[j].x) { - av_log(avccontext, AV_LOG_ERROR, + av_log(avctx, AV_LOG_ERROR, "Duplicate value found in floor 1 X coordinates\n"); return AVERROR_INVALIDDATA; } |