1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
FFmpeg/libswscale
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
..
bfin Merge remote-tracking branch 'qatar/master' 2012-02-03 03:51:32 +01:00
ppc Merge remote-tracking branch 'qatar/master' 2012-03-07 03:22:49 +01:00
sparc Merge remote-tracking branch 'qatar/master' 2012-02-08 05:53:35 +01:00
x86 Merge remote-tracking branch 'qatar/master' 2012-03-16 01:36:49 +01:00
colorspace-test.c swscale-test: Drop unused argc and argv arguments from main(). 2012-02-01 14:24:25 +01:00
input.c Support RGBA64 as input colour space. 2012-03-04 00:43:18 +01:00
libswscale.v Add symbol versioning for shared libraries 2010-01-16 04:48:55 +00:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-02-09 01:27:12 +01:00
options.c Merge remote-tracking branch 'qatar/master' 2012-03-05 00:15:55 +01:00
output.c Merge remote-tracking branch 'qatar/master' 2012-03-08 02:51:45 +01:00
rgb2rgb_template.c Merge remote-tracking branch 'qatar/master' 2012-02-23 04:31:55 +01:00
rgb2rgb.c Merge remote-tracking branch 'qatar/master' 2012-02-23 04:31:55 +01:00
rgb2rgb.h Merge remote-tracking branch 'qatar/master' 2012-01-14 02:22:09 +01:00
swscale_internal.h Merge remote-tracking branch 'qatar/master' 2012-03-07 03:22:49 +01:00
swscale_unscaled.c Merge remote-tracking branch 'qatar/master' 2012-02-08 05:53:35 +01:00
swscale-test.c Merge remote-tracking branch 'qatar/master' 2012-01-14 02:22:09 +01:00
swscale.c Merge remote-tracking branch 'qatar/master' 2012-03-07 03:22:49 +01:00
swscale.h Merge remote-tracking branch 'qatar/master' 2012-01-10 03:50:41 +01:00
utils.c Merge remote-tracking branch 'qatar/master' 2012-03-07 03:22:49 +01:00
yuv2rgb.c Merge remote-tracking branch 'qatar/master' 2012-02-23 04:31:55 +01:00