• Michael Niedermayer's avatar
    Merge commit '6fee1b90' · 0aa09548
    Michael Niedermayer authored
    * commit '6fee1b90':
      avcodec: Add av_cold attributes to init functions missing them
    
    Conflicts:
    	libavcodec/aacpsy.c
    	libavcodec/atrac3.c
    	libavcodec/dvdsubdec.c
    	libavcodec/ffv1.c
    	libavcodec/ffv1enc.c
    	libavcodec/h261enc.c
    	libavcodec/h264_parser.c
    	libavcodec/h264dsp.c
    	libavcodec/h264pred.c
    	libavcodec/libschroedingerenc.c
    	libavcodec/libxvid_rc.c
    	libavcodec/mpeg12.c
    	libavcodec/mpeg12enc.c
    	libavcodec/proresdsp.c
    	libavcodec/rangecoder.c
    	libavcodec/videodsp.c
    	libavcodec/x86/proresdsp_init.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    0aa09548
wmaenc.c 13.4 KB