ffmpeg/libswscale
Michael Niedermayer 0edf7ebcd6 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  h264: clear trailing bits in partially parsed NAL units
  vc1: Handle WVC1 interlaced stream
  xl: Fix overreads
  mpegts: rename payload_index to payload_size
  segment: introduce segmented chain muxer
  lavu: add AVERROR_BUG error value
  avplay: clear pkt_temp when pkt is freed.
  qcelpdec: K&R formatting cosmetics
  qcelpdec: cosmetics: drop some pointless parentheses
  x86: conditionally compile dnxhd encoder optimizations
  Revert "h264: skip start code search if the size of the nal unit is known"
  swscale: fix formatting and indentation of unscaled conversion routines.
  h264: skip start code search if the size of the nal unit is known
  cljr: fix buf_size sanity check
  cljr: Check if width and height are positive integers

Conflicts:
	libavcodec/cljr.c
	libavcodec/vc1dec.c
	libavformat/Makefile
	libavformat/mpegtsenc.c
	libavformat/segment.c
	libswscale/swscale_unscaled.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-20 04:12:09 +01:00
..
bfin
mlib
ppc Merge remote-tracking branch 'qatar/master' 2011-10-23 05:13:56 +02:00
sparc
x86 Merge remote-tracking branch 'qatar/master' 2011-12-14 23:58:10 +01:00
colorspace-test.c
libswscale.v
Makefile Merge remote-tracking branch 'qatar/master' 2011-12-13 23:21:37 +01:00
options.c Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
rgb2rgb_template.c Use more accurate conversion for rgb15/16 to rgb24/32 (C/MMX). 2011-11-09 01:58:22 +01:00
rgb2rgb.c Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
rgb2rgb.h lsws: remove deprecated and unused stuff after the 0->1 major bump 2011-08-04 00:23:00 +02:00
swscale_internal.h Merge remote-tracking branch 'qatar/master' 2011-12-13 00:39:48 +01:00
swscale_unscaled.c Merge remote-tracking branch 'qatar/master' 2011-12-20 04:12:09 +01:00
swscale-test.c sws: update copyright dates 2011-11-18 21:44:26 +01:00
swscale.c swscale: fix overflows in vertical scaling at top/bottom edges. 2011-12-18 08:27:43 -08:00
swscale.h Merge remote-tracking branch 'qatar/master' 2011-12-13 00:39:48 +01:00
utils.c sws: Print an error in case of av_malloc() failure 2011-12-19 16:02:52 +01:00
yuv2rgb.c sws: Fix warning: ‘abase’ may be used uninitialized in this function 2011-11-18 21:51:29 +01:00