[FFmpeg-cvslog] Merge commit 'e8da807537e314d74cb6d93598f1dcfb891fa655'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Feb 26 12:50:34 2013 +0100| [6fbddc80d63ddbc8974f4b2e286de20def6c201d] | committer: Michael Niedermayer

Merge commit 'e8da807537e314d74cb6d93598f1dcfb891fa655'

* commit 'e8da807537e314d74cb6d93598f1dcfb891fa655':
  cmdutils: only use libavresample when it is enabled
  libschroedinger: cosmetics: rename variable avccontext to avctx
  vorbisenc: cosmetics: rename variable avccontext to avctx

Conflicts:
	cmdutils.c
	libavcodec/libschroedinger.c
	libavcodec/libschroedingerenc.c
	libavcodec/vorbisenc.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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