• Michael Niedermayer's avatar
    Merge commit 'e8da8075' · 6fbddc80
    Michael Niedermayer authored
    * commit 'e8da8075':
      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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    6fbddc80
cmdutils.c 61.2 KB