• Michael Niedermayer's avatar
    Merge remote branch 'qatar/master' · 5a153604
    Michael Niedermayer authored
    * qatar/master:
      Fix FSF address copy paste error in some license headers.
      Add an aac sample which uses LTP to fate-aac.
    DUPLICATE  [PATCH] Update pixdesc_be fate refs after adding 9/10bit YUV420P formats.
      arm: properly mark external symbol call
    
    Conflicts:
    	libavcodec/x86/ac3dsp.asm
    	libavcodec/x86/deinterlace.asm
    	libavcodec/x86/dsputil_yasm.asm
    	libavcodec/x86/dsputilenc_yasm.asm
    	libavcodec/x86/fft_mmx.asm
    	libavcodec/x86/fmtconvert.asm
    	libavcodec/x86/h264_chromamc.asm
    	libavcodec/x86/h264_deblock.asm
    	libavcodec/x86/h264_idct.asm
    	libavcodec/x86/h264_intrapred.asm
    	libavcodec/x86/h264_weight.asm
    	libavcodec/x86/vc1dsp_yasm.asm
    	libavcodec/x86/vp3dsp.asm
    	libavcodec/x86/vp56dsp.asm
    	libavcodec/x86/vp8dsp.asm
    	libavcodec/x86/x86util.asm
    	libswscale/ppc/swscale_template.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    5a153604
deinterlace.asm 2.48 KB