Michael Niedermayer 6fbddc80d6 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>

2013-02-26 12:50:34 +01:00

3.8 KiB

Raw Blame History

View Raw