ffmpeg/libavformat
Michael Niedermayer 4257ce112c 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>
2012-03-16 01:36:49 +01:00
..
2012-02-06 20:33:06 +01:00
2012-03-03 04:30:49 +01:00
2011-11-05 16:51:25 +01:00
2012-03-13 01:14:04 +01:00
2011-12-13 20:01:49 +01:00
2011-12-19 11:57:34 +01:00
2012-03-13 01:14:04 +01:00
2012-03-03 04:30:49 +01:00
2011-08-01 00:58:49 +02:00
2011-12-30 20:00:53 +01:00
2011-08-09 19:56:25 +02:00
2012-02-02 14:31:17 +01:00
2012-03-03 04:30:49 +01:00
2011-04-04 01:29:40 +02:00
2011-04-20 04:48:23 +02:00
2012-03-08 21:31:45 +01:00
2012-03-10 18:01:03 +01:00
2012-02-02 14:31:17 +01:00
2012-03-13 01:14:04 +01:00
2012-03-02 11:11:38 +01:00
2011-12-20 22:38:53 +01:00
2012-02-29 14:26:14 +01:00
2012-02-28 07:20:36 +01:00
2012-02-26 07:30:21 +01:00
2012-02-23 16:00:22 +01:00
2012-02-28 15:01:20 +01:00
2012-02-14 10:12:44 +01:00
2012-01-16 11:29:55 +01:00
2012-03-12 21:50:46 +01:00
2011-12-30 20:00:53 +01:00