Michael Niedermayer a9bd51b1e6 Merge commit '9953ff3cd844eb5f6d8dfce98cad94b78a0fc7dc' ...

* commit '9953ff3cd844eb5f6d8dfce98cad94b78a0fc7dc':
  mpegvideo: fix indentation
  sws: do not use av_pix_fmt_descriptors directly.

Conflicts:
	libavcodec/mpegvideo.c
	libswscale/swscale_internal.h
	libswscale/swscale_unscaled.c
	libswscale/utils.c

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

2012-10-12 15:57:28 +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

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

2012-10-08 21:06:57 +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

Merge remote-tracking branch 'qatar/master'

2012-02-23 04:31:55 +01: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

Merge commit '9953ff3cd844eb5f6d8dfce98cad94b78a0fc7dc'

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

swscale_unscaled.c

Merge commit '9953ff3cd844eb5f6d8dfce98cad94b78a0fc7dc'

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

swscale-test.c

Merge commit '9953ff3cd844eb5f6d8dfce98cad94b78a0fc7dc'

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

swscale.c

Merge commit '9953ff3cd844eb5f6d8dfce98cad94b78a0fc7dc'

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

swscale.h

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

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

utils.c

Merge commit '9953ff3cd844eb5f6d8dfce98cad94b78a0fc7dc'

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

version.h

Merge remote-tracking branch 'qatar/master'

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

yuv2rgb.c

yuv2rgb: fix declared array sizes, so they match actuals.

2012-10-11 18:20:24 +02:00