1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
FFmpeg/libswscale
Michael Niedermayer 2ec77aae67 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  lavf: make compute_pkt_fields2() return meaningful error values
  matroskadec: set timestamps for RealAudio packets.
  intelh263dec: aspect ratio processing fix.
  intelh263dec: fix "Strict H.263 compliance"  file playback
  oss,sndio: simplify by using FFMIN.
  swscale: extract monowhite/black output from yuv2packed[12X]_c().
  swscale: de-macro'ify RGB15/16/32 input functions.
  swscale: rearrange code.
  movdec: Add support for the 'wfex' atom.
  ffmpeg.c: Add a necessary const qualifier
  riff: Fix potential memleak.
  swscale: change 48bit RGB input macros to inline functions.
  swscale: change 9/10bit YUV input macros to inline functions.
  swscale: extract gray16 output functions from yuv2packed[12X]().
  swscale: use standard clipping functions.
  swscale: merge macros that are used only once.
  swscale: fix function declarations in swscale.c.
  swscale: fix function declaration keywords in x86/swscale_template.c.

Conflicts:
	ffmpeg.c
	libavcodec/intelh263dec.c
	libswscale/swscale.c
	libswscale/x86/swscale_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-10 04:47:23 +02:00
..
bfin swscale: fix compilation of bfin due to missing pixdesc.h header 2011-06-01 13:30:35 +02:00
mlib Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
ppc Merge remote-tracking branch 'qatar/master' 2011-06-08 05:25:28 +02:00
sparc Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
x86 Merge remote-tracking branch 'qatar/master' 2011-06-10 04:47:23 +02:00
colorspace-test.c Merge remote-tracking branch 'qatar/master' into master 2011-05-29 03:34:35 +02:00
libswscale.v Add symbol versioning for shared libraries 2010-01-16 04:48:55 +00:00
Makefile swscale: split swscale.c in unscaled and generic conversion routines. 2011-06-03 09:52:09 -07:00
options.c Merge remote-tracking branch 'qatar/master' 2011-05-25 06:32:45 +02:00
rgb2rgb_template.c Merge remote-tracking branch 'qatar/master' 2011-05-30 01:29:11 +02:00
rgb2rgb.c Merge remote-tracking branch 'qatar/master' into master 2011-05-29 03:34:35 +02:00
rgb2rgb.h Merge remote-tracking branch 'qatar/master' into master 2011-05-29 03:34:35 +02:00
swscale_internal.h Merge remote-tracking branch 'qatar/master' 2011-06-08 05:25:28 +02:00
swscale_template.c Merge remote-tracking branch 'qatar/master' 2011-06-04 06:35:17 +02:00
swscale_unscaled.c Merge remote-tracking branch 'qatar/master' 2011-06-04 06:35:17 +02:00
swscale-test.c swscale: Remove commented-out printf cruft. 2011-05-28 11:09:30 +02:00
swscale.c Merge remote-tracking branch 'qatar/master' 2011-06-10 04:47:23 +02:00
swscale.h swscale: reintroduce sws_format_name() symbol 2011-06-03 00:41:14 +02:00
utils.c Merge remote-tracking branch 'qatar/master' 2011-06-10 04:47:23 +02:00
yuv2rgb.c swscale: remove sws_format_name() 2011-05-30 09:07:43 +02:00