Merge commit 'e8da807537e314d74cb6d93598f1dcfb891fa655'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 26 Feb 2013 11:50:34 +0000 (12:50 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 26 Feb 2013 11:50:34 +0000 (12:50 +0100)
commit6fbddc80d63ddbc8974f4b2e286de20def6c201d
tree327dd7a19fba89a54ba3333fba3545e7598d3e96
parent13fa074173269308f5051bb1a683c9ed54ab8735
parente8da807537e314d74cb6d93598f1dcfb891fa655
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@gmx.at>
cmdutils.c
libavcodec/libschroedinger.c
libavcodec/libschroedinger.h
libavcodec/libschroedingerdec.c
libavcodec/libschroedingerenc.c
libavcodec/vorbisenc.c