Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 16 Mar 2012 00:36:49 +0000 (01:36 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 16 Mar 2012 00:36:49 +0000 (01:36 +0100)
commit4257ce112c41f741408b817d305630dadc3ee52d
tree7121a52130f9b73dd4a2cdbae2d71d50918a39d5
parentc743aad557fe14980b9912869d90008ecb29ba97
parent702985b8b7bfe0d8eac2747f3a03e7f15886364c
Merge remote-tracking branch 'qatar/master'

* 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: Michael Niedermayer <michaelni@gmx.at>
ffmpeg.c
libavcodec/dxa.c
libavformat/utils.c
libavutil/x86/x86inc.asm
libswscale/x86/scale.asm