• Michael Niedermayer's avatar
    Merge commit '13207484' · 64a0ed19
    Michael Niedermayer authored
    * commit '13207484':
      mpeg4video_parser: stop using deprecated avcodec_set_dimensions
      mpeg12dec: stop using deprecated avcodec_set_dimensions
      mjpegdec: stop using deprecated avcodec_set_dimensions
      libvpxdec: stop using deprecated avcodec_set_dimensions
    
    Conflicts:
    	libavcodec/mjpegdec.c
    	libavcodec/mpeg12dec.c
    	libavcodec/mpeg4video_parser.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    64a0ed19
mpeg4video_parser.c 4.54 KB