• Michael Niedermayer's avatar
    Merge commit '6906b193' · a41bf09d
    Michael Niedermayer authored
    * commit '6906b193':
      lavc: add missing files for arm
      lavc: introduce VideoDSPContext
    
    Conflicts:
    	configure
    	libavcodec/arm/dsputil_init_armv5te.c
    	libavcodec/dsputil.c
    	libavcodec/dsputil.h
    	libavcodec/dsputil_template.c
    	libavcodec/h264.c
    	libavcodec/mpegvideo.h
    	libavcodec/mpegvideo_enc.c
    	libavcodec/x86/dsputil_mmx.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    a41bf09d
h264.c 171 KB