• Michael Niedermayer's avatar
    Merge commit '620289a2' · 6c388848
    Michael Niedermayer authored
    * commit '620289a2':
      sh4: Fix silly type vs. variable name search and replace typo
      configure: Group all hwaccels together in a separate variable
      Add av_cold attributes to arch-specific init functions
    
    Conflicts:
    	configure
    	libavcodec/arm/mpegvideo_armv5te.c
    	libavcodec/x86/mlpdsp.c
    	libavcodec/x86/motion_est.c
    	libavcodec/x86/mpegvideoenc.c
    	libavcodec/x86/videodsp_init.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    6c388848
mpegaudiodec.c 10.1 KB