Michael Niedermayer 2dbc93455c Merge commit '80521c1997a23e148edf89e11b939ab8646297ca' ...

* commit '80521c1997a23e148edf89e11b939ab8646297ca':
  build: allow targets to specify extra objects to link with executables
  swscale: avoid pointless use of compound literals
  libm: add fallbacks for various single-precision functions
  network: use getservbyport() only if available
  network: add fallbacks for INADDR_LOOPBACK and INET_ADDRSTRLEN
  Include sys/time.h before sys/resource.h

Conflicts:
	Makefile
	configure
	libavutil/libm.h

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

2012-10-24 12:53:26 +02:00

..

bfin

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

2012-10-08 21:06:57 +02:00

ppc

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

2012-10-08 21:06:57 +02:00

sparc

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

2012-10-08 21:06:57 +02:00

x86

Replace usage of the deprecated av_pix_fmt_descriptors array with av_pix_fmt_desc_get

2012-10-20 18:00:13 +02:00

colorspace-test.c

Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112'

2012-08-29 18:04:34 +02:00

input.c

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

2012-10-08 21:06:57 +02:00

libswscale.v

swscale: Do not make ff_ symbols globally visible.

2012-10-10 02:08:01 +02:00

Makefile

Merge remote-tracking branch 'qatar/master'

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

options.c

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

2012-10-08 21:06:57 +02:00

output.c

Merge commit '9953ff3cd844eb5f6d8dfce98cad94b78a0fc7dc'

2012-10-12 15:57:28 +02:00

rgb2rgb_template.c

yuvPlanartouyvy_c: fix sign extension

2012-10-16 21:06:24 +02:00

rgb2rgb.c

Merge remote-tracking branch 'qatar/master'

2012-07-23 21:25:09 +02:00

rgb2rgb.h

swscale: unscaled rgba64->rgb48

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

swscale_internal.h

Replace usage of the deprecated av_pix_fmt_descriptors array with av_pix_fmt_desc_get

2012-10-20 18:00:13 +02:00

swscale_unscaled.c

Merge commit '80521c1997a23e148edf89e11b939ab8646297ca'

2012-10-24 12:53:26 +02:00

swscale-test.c

sws-test: parse command line args before initing contexts

2012-10-17 11:56:36 +02:00

swscale.c

sws: get rid of C99 signed overflows try #2

2012-10-14 05:16:59 +02:00

swscale.h

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

2012-10-08 21:06:57 +02:00

utils.c

Merge remote-tracking branch 'qatar/master'

2012-10-15 14:09:35 +02:00

version.h

Merge remote-tracking branch 'qatar/master'

2012-08-04 23:51:43 +02:00

yuv2rgb.c

yuv2rgb: fix integer overflow in fill_gv_table()

2012-10-24 01:24:26 +02:00