ffmpeg/libswscale
Michael Niedermayer 39e4206dc6 Merge remote-tracking branch 'qatar/master'
* qatar/master: (32 commits)
  doc: create separate section for audio encoders
  swscale: Remove orphaned, commented-out function declaration.
  swscale: Eliminate rgb24toyv12_c() duplication.
  Remove h263_msmpeg4 from MpegEncContext.
  APIchanges: Fill in git hash for fps_probe_size (30315a8)
  avformat: Add fpsprobesize as an AVOption.
  avoptions: Return explicitly NAN or {0,0} if the option isn't found
  rtmp: Reindent
  rtmp: Don't try to do av_malloc(0)
  tty: replace AVFormatParameters.sample_rate abuse with a private option.
  Fix end time of last chapter in compute_chapters_end
  ffmpeg: get rid of useless AVInputStream.nb_streams.
  ffmpeg: simplify managing input files and streams
  ffmpeg: purge redundant AVInputStream.index.
  lavf: deprecate AVFormatParameters.channel.
  libdc1394: add a private option for channel.
  dv1394: add a private option for channel.
  v4l2: reindent.
  v4l2: add a private option for channel.
  lavf: deprecate AVFormatParameters.standard.
  ...

Conflicts:
	doc/APIchanges
	doc/encoders.texi
	ffmpeg.c
	libavdevice/alsa-audio.h
	libavformat/version.h
	libavutil/opt.c
	libswscale/rgb2rgb.h
	libswscale/rgb2rgb_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-26 03:28:22 +02:00
..
bfin Merge remote-tracking branch 'qatar/master' 2011-05-25 06:32:45 +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-05-25 06:32:45 +02:00
sparc Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
x86 swscale: Eliminate rgb24toyv12_c() duplication. 2011-05-26 00:56:06 +02:00
colorspace-test.c Merge remote-tracking branch 'qatar/master' 2011-05-25 06:32:45 +02:00
libswscale.v Add symbol versioning for shared libraries 2010-01-16 04:48:55 +00:00
Makefile Merge swscale bloatup 2011-05-25 06:24:55 +02: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-26 03:28:22 +02:00
rgb2rgb.c Merge remote-tracking branch 'qatar/master' 2011-05-25 06:32:45 +02:00
rgb2rgb.h Merge remote-tracking branch 'qatar/master' 2011-05-26 03:28:22 +02:00
swscale_internal.h Merge remote-tracking branch 'qatar/master' 2011-05-25 06:32:45 +02:00
swscale_template.c Merge remote-tracking branch 'qatar/master' 2011-05-25 06:32:45 +02:00
swscale-test.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
swscale.c Merge remote-tracking branch 'qatar/master' 2011-05-25 06:32:45 +02:00
swscale.h swscale: document SWS_CPU_CAPS* 2011-05-25 21:04:44 +02:00
utils.c Return -1 on invalid input instead of crashing. 2011-05-25 20:12:17 +02:00
yuv2rgb.c Merge remote-tracking branch 'qatar/master' 2011-05-25 06:32:45 +02:00