Merge commit 'e951b6d94c441d46b396ef12da1428297d77251d'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 26 Feb 2013 11:39:26 +0000 (12:39 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 26 Feb 2013 11:39:26 +0000 (12:39 +0100)
commit13fa074173269308f5051bb1a683c9ed54ab8735
treecd4fa30b5b54e7dbc38b4c9cb7d5708ff5b91824
parent2b277f2992d66b7f02fdf8d3642c326087d362a9
parente951b6d94c441d46b396ef12da1428297d77251d
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>
configure
libavcodec/vorbis.c
libavcodec/vorbis.h
libavcodec/vorbisdec.c