Michael Niedermayer 32c3038734 Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  x86: swscale: Place inline assembly code under appropriate #ifdefs
  rtsp: remove terminal comma in FF_RTP_FLAG_OPTS macro.
  configure: Remove redundant RTMPT/RTMPTS dependencies
  configure: add filtering of host cflags/ldflags
  configure: initialise all flag filters at the same place
  configure: add filtering of linker flags
  configure: name some variables more consistently
  configure: remove filter_cppflags
  configure: set icc_version where it is needed
  mpegenc: remove disabled code

Conflicts:
	configure
	libavformat/movenc.c
	libswscale/x86/swscale_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2012-07-22 05:05:02 +02:00

..

bfin

Merge remote-tracking branch 'qatar/master'

2012-06-20 20:47:46 +02:00

ppc

Fix destination row striding in altivec_yuv2_bgr24.

2012-07-06 17:40:43 +02:00

sparc

Merge remote-tracking branch 'qatar/master'

2012-04-13 21:50:37 +02:00

x86

Merge remote-tracking branch 'qatar/master'

2012-07-22 05:05:02 +02:00

colorspace-test.c

swscale: unscaled rgba64->rgb48

2012-07-19 00:17:16 +00:00

input.c

swscale/input: silence warnings about incompatible pointer types

2012-07-19 15:49:21 +00:00

libswscale.v

…

Makefile

Merge remote-tracking branch 'qatar/master'

2012-07-04 21:03:28 +02:00

options.c

lavu: 256 color support

2012-07-07 01:41:55 +00:00

output.c

yuv2rgb: implement 15/16bit ordered dither

2012-07-17 14:25:49 +02:00

rgb2rgb_template.c

…

rgb2rgb.c

swscale: unscaled rgba64->rgb48

2012-07-19 00:17:16 +00:00

rgb2rgb.h

swscale: unscaled rgba64->rgb48

2012-07-19 00:17:16 +00:00

swscale_internal.h

sws: support 12&14 bit planar colorspaces

2012-07-04 23:47:01 +02:00

swscale_unscaled.c

swscale: unscaled rgba64->rgb48

2012-07-19 00:17:16 +00:00

swscale-test.c

…

swscale.c

sws: support 12&14 bit planar colorspaces

2012-07-04 23:47:01 +02:00

swscale.h

sws: more complete doxy for sws_setColorspaceDetails()

2012-07-18 21:25:29 +02:00

utils.c

sws: handle non native rgb<->rgb convertions

2012-07-17 14:40:59 +02:00

version.h

Merge remote-tracking branch 'qatar/master'

2012-07-04 21:03:28 +02:00

yuv2rgb.c

yuv2rgb: implement 15/16bit ordered dither

2012-07-17 14:25:49 +02:00