• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 4257ce11
    Michael Niedermayer authored
    * qatar/master:
      dxa: remove useless code
      lavf: don't select an attached picture as default stream for seeking.
      avconv: remove pointless checks.
      avconv: check for get_filtered_frame() failure.
      avconv: remove a pointless check.
      swscale: convert hscale() to use named arguments.
      x86inc: add *mp named argument support to DEFINE_ARGS.
      swscale: convert hscale to cpuflags().
    
    Conflicts:
    	ffmpeg.c
    	libswscale/x86/scale.asm
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    4257ce11
x86inc.asm 28.3 KB