[FFmpeg-cvslog] Merge commit 'e951b6d94c441d46b396ef12da1428297d77251d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Feb 26 12:39:26 2013 +0100| [13fa074173269308f5051bb1a683c9ed54ab8735] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=13fa074173269308f5051bb1a683c9ed54ab8735
---