Commit 13fa0741 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'e951b6d9'

* commit 'e951b6d9':
  vorbisdec: cosmetics: rename variable avccontext to avctx
  configure: Identify icc compiler with a less ambiguous pattern

Conflicts:
	libavcodec/vorbisdec.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 2b277f29 e951b6d9
...@@ -2636,7 +2636,7 @@ probe_cc(){ ...@@ -2636,7 +2636,7 @@ probe_cc(){
fi fi
_cflags_speed='-O3' _cflags_speed='-O3'
_cflags_size='-Os' _cflags_size='-Os'
elif $_cc --version 2>/dev/null | grep -q Intel; then elif $_cc --version 2>/dev/null | grep -q ^icc; then
_type=icc _type=icc
_ident=$($_cc --version | head -n1) _ident=$($_cc --version | head -n1)
_depflags='-MMD' _depflags='-MMD'
......
...@@ -121,7 +121,7 @@ int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, unsigned num) ...@@ -121,7 +121,7 @@ int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, unsigned num)
return 0; return 0;
} }
int ff_vorbis_ready_floor1_list(AVCodecContext *avccontext, int ff_vorbis_ready_floor1_list(AVCodecContext *avctx,
vorbis_floor1_entry *list, int values) vorbis_floor1_entry *list, int values)
{ {
int i; int i;
...@@ -147,7 +147,7 @@ int ff_vorbis_ready_floor1_list(AVCodecContext *avccontext, ...@@ -147,7 +147,7 @@ int ff_vorbis_ready_floor1_list(AVCodecContext *avccontext,
int j; int j;
for (j = i + 1; j < values; j++) { for (j = i + 1; j < values; j++) {
if (list[i].x == list[j].x) { 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"); "Duplicate value found in floor 1 X coordinates\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
......
...@@ -36,7 +36,7 @@ typedef struct vorbis_floor1_entry { ...@@ -36,7 +36,7 @@ typedef struct vorbis_floor1_entry {
uint16_t high; uint16_t high;
} vorbis_floor1_entry; } 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); vorbis_floor1_entry *list, int values);
unsigned int ff_vorbis_nth_root(unsigned int x, unsigned int n); // x^(1/n) 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); int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, unsigned num);
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment