• Michael Niedermayer's avatar
    Merge commit '88bd7fdc' · ac898759
    Michael Niedermayer authored
    * commit '88bd7fdc':
      Drop DCTELEM typedef
    
    Conflicts:
    	libavcodec/alpha/dsputil_alpha.h
    	libavcodec/alpha/motion_est_alpha.c
    	libavcodec/arm/dsputil_init_armv6.c
    	libavcodec/bfin/dsputil_bfin.h
    	libavcodec/bfin/pixels_bfin.S
    	libavcodec/cavs.c
    	libavcodec/cavsdec.c
    	libavcodec/dct-test.c
    	libavcodec/dnxhdenc.c
    	libavcodec/dsputil.c
    	libavcodec/dsputil.h
    	libavcodec/dsputil_template.c
    	libavcodec/eamad.c
    	libavcodec/h264_cavlc.c
    	libavcodec/h264idct_template.c
    	libavcodec/mpeg12.c
    	libavcodec/mpegvideo.c
    	libavcodec/mpegvideo.h
    	libavcodec/mpegvideo_enc.c
    	libavcodec/ppc/dsputil_altivec.c
    	libavcodec/proresdsp.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    ac898759
mjpegdec.c 67.4 KB