1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00
FFmpeg/libavcodec
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-03-15 22:07:54 +01:00
2012-03-07 12:16:36 -08:00
2012-03-13 01:14:04 +01:00
2012-03-15 22:12:02 +01:00
2012-03-15 22:12:02 +01:00
2012-03-13 01:14:04 +01:00
2012-03-13 22:05:22 +01:00
2012-03-07 05:11:40 +01:00
2012-03-02 18:58:19 +02:00
2012-03-02 18:58:19 +02:00
2012-03-15 22:17:36 +01:00
2012-03-03 04:14:37 +01:00
2012-03-13 22:38:45 +01:00
2012-03-13 01:14:04 +01:00
2012-03-06 10:47:42 -08:00
2012-03-07 10:29:52 -08:00
2012-03-10 20:17:11 +01:00
2012-03-10 20:17:11 +01:00
2012-03-09 09:17:07 +01:00
2012-03-08 17:13:58 +01:00
2012-03-13 01:14:04 +01:00
2012-03-13 01:14:04 +01:00
2012-03-02 08:26:36 +01:00