• Michael Niedermayer's avatar
    Merge commit '967cd6fa' · bf92cd81
    Michael Niedermayer authored
    * commit '967cd6fa':
      libopenjpegdec: stop using deprecated avcodec_set_dimensions
      kgv1dec: stop using deprecated avcodec_set_dimensions
      ivi_common: stop using deprecated avcodec_set_dimensions
      indeo3: stop using deprecated avcodec_set_dimensions
    
    Conflicts:
    	libavcodec/ivi_common.c
    	libavcodec/kgv1dec.c
    	libavcodec/libopenjpegdec.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    bf92cd81
ivi_common.c 61 KB