1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-03 05:10:03 +02:00
FFmpeg/libswscale
Michael Niedermayer bb4fb7715c Merge remote-tracking branch 'qatar/master'
* qatar/master:
  swscale: fix NULL checking in sws_alloc_context()
  mxfdec: fix NULL checking in mxf_get_sorted_table_segments()
  finalize changelog for version 9

Conflicts:
	Changelog
	libavformat/mxfdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-05 13:37:30 +01:00
..
bfin
ppc Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3' 2012-12-21 17:32:52 +01:00
sparc
x86
colorspace-test.c
input.c
libswscale.v
Makefile
options.c
output.c
rgb2rgb_template.c
rgb2rgb.c
rgb2rgb.h
swscale_internal.h
swscale_unscaled.c
swscale-test.c libswscale/swscale-test: fix some const correctness 2012-12-26 03:14:59 +01:00
swscale.c sws: fix warning: cast from pointer to integer of different size 2012-12-29 20:50:43 +01:00
swscale.h
utils.c Merge remote-tracking branch 'qatar/master' 2013-01-05 13:37:30 +01:00
version.h
yuv2rgb.c