ffmpeg/libswscale
Michael Niedermayer b18e17eabf Merge remote-tracking branch 'qatar/master'
* qatar/master: (21 commits)
  utils: Check for extradata size overflows.
  ARM: rv34: fix asm syntax in dc transform functions
  avio: Fix the value of the deprecated URL_FLAG_NONBLOCK
  rv34: fix and optimise frame dependency checking
  rv34: NEON optimised dc only inverse transform
  avprobe: use avio_size() instead of deprecated AVFormatContext.file_size.
  ffmenc: remove references to deprecated AVFormatContext.timestamp.
  lavf: undeprecate read_seek().
  avserver: remove code using deprecated CODEC_CAP_PARSE_ONLY.
  lavc: replace some remaining FF_I_TYPE with AV_PICTURE_TYPE_I
  lavc: ifdef out parse_only AVOption
  nellymoserdec: SAMPLE_FMT -> AV_SAMPLE_FMT
  mpegvideo_enc: ifdef out/replace references to deprecated codec flags.
  riff: remove references to sonic codec ids
  indeo4: add some missing static and const qualifiers
  rv34: DC-only inverse transform
  avconv: use AVFrame.width/height/format instead of corresponding AVCodecContext fields
  lavfi: move version macros to a new installed header version.h
  vsrc_buffer: release the buffer on uninit.
  rgb2rgb: rgb12tobgr12()
  ...

Conflicts:
	avconv.c
	doc/APIchanges
	ffprobe.c
	libavfilter/Makefile
	libavfilter/avfilter.h
	libswscale/rgb2rgb.c
	libswscale/rgb2rgb.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-13 01:29:48 +01:00
..
bfin Merge remote-tracking branch 'qatar/master' 2011-06-22 05:16:40 +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' 2012-01-10 03:50:41 +01:00
sparc Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
x86 Fix compilation with yasm-0.6.2 2012-01-12 16:35:49 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-01-10 03:50:41 +01:00
colorspace-test.c Merge remote-tracking branch 'qatar/master' 2012-01-10 03:50:41 +01:00
libswscale.v
options.c Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
rgb2rgb.c Merge remote-tracking branch 'qatar/master' 2012-01-13 01:29:48 +01:00
rgb2rgb.h rgb2rgb: rgb12tobgr12() 2012-01-11 15:52:53 -08:00
rgb2rgb_template.c Use more accurate conversion for rgb15/16 to rgb24/32 (C/MMX). 2011-11-09 01:58:22 +01:00
swscale-test.c Merge remote-tracking branch 'qatar/master' 2012-01-10 03:50:41 +01:00
swscale.c sws: Remove unneeded YUV cliping from yuv2rgb_X_c_template() 2012-01-11 21:29:59 +01:00
swscale.h Merge remote-tracking branch 'qatar/master' 2012-01-10 03:50:41 +01:00
swscale_internal.h sws: Move yuv2rgb clipping into the tables. 2012-01-11 15:04:02 +01:00
swscale_unscaled.c rgb2rgb: rgb12tobgr12() 2012-01-11 15:52:53 -08:00
utils.c swscale: Force full horizontal chroma internally when the output has a odd size. 2012-01-11 21:27:21 +01:00
yuv2rgb.c sws: Move yuv2rgb clipping into the tables. 2012-01-11 15:04:02 +01:00