1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
FFmpeg/libswscale
Michael Niedermayer 653d117c29 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  libschroedinger: Switch to function names more in line with Libav style.
  Move code shared between libdirac and libschroedinger to libschroedinger.
  lavfi: uninline avfilter_copy_buffer_ref_props().
  lavf: add missing '*' in a doxy.
  h264: Remove a commented-out function pointer typedef.
  txd: Remove write-only variable in txd_decode_frame().
  mmvideo.c: Remove unused variable in mm_decode_pal().
  build: cosmetics: Add missing end-of-line backslashes to item lists.
  build: cosmetics: Split HEADERS/OBJS/PROGS lists into one entry per line.
  libschroedinger: Move a function to avoid a forward declaration.
  pthread: warn on high thread counts
  vf_yadif: fix missing error handling for avfilter_poll_frame()
  avprobe: allow showing only one container/stream property.
  lavfi: support audio in avfilter_copy_frame_props().
  lavfi: avfilter_merge_formats: handle case where inputs are same
  lavc: add sample rate and channel layout to AVFrame.
  zerocodec: check if the previous frame is missing
  doc: clarify check for NULL pointer style

Conflicts:
	doc/APIchanges
	doc/developer.texi
	ffprobe.c
	libavcodec/Makefile
	libavcodec/avcodec.h
	libavcodec/libdirac_libschro.c
	libavcodec/libdirac_libschro.h
	libavcodec/mmvideo.c
	libavcodec/txd.c
	libavcodec/version.h
	libavcodec/zerocodec.c
	libavfilter/Makefile
	libavfilter/avfilter.c
	libavfilter/version.h
	libavformat/Makefile
	libavutil/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-07 22:51:34 +02:00
..
bfin Merge remote-tracking branch 'qatar/master' 2012-04-13 21:50:37 +02:00
ppc Merge remote-tracking branch 'qatar/master' 2012-04-13 21:50:37 +02:00
sparc Merge remote-tracking branch 'qatar/master' 2012-04-13 21:50:37 +02:00
x86 Merge remote-tracking branch 'qatar/master' 2012-04-13 21:50:37 +02:00
colorspace-test.c swscale-test: Drop unused argc and argv arguments from main(). 2012-02-01 14:24:25 +01:00
input.c Merge remote-tracking branch 'qatar/master' 2012-04-24 02:30:41 +02:00
libswscale.v Add symbol versioning for shared libraries 2010-01-16 04:48:55 +00:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-05-07 22:51:34 +02:00
options.c Merge remote-tracking branch 'qatar/master' 2012-03-05 00:15:55 +01:00
output.c sws: remove cliping in yuv2rgb code. 2012-04-15 23:38:42 +02:00
rgb2rgb_template.c Merge remote-tracking branch 'qatar/master' 2012-02-23 04:31:55 +01:00
rgb2rgb.c Merge remote-tracking branch 'qatar/master' 2012-02-23 04:31:55 +01:00
rgb2rgb.h Merge remote-tracking branch 'qatar/master' 2012-01-14 02:22:09 +01:00
swscale_internal.h Merge remote-tracking branch 'qatar/master' 2012-04-13 21:50:37 +02:00
swscale_unscaled.c Merge remote-tracking branch 'qatar/master' 2012-04-04 01:14:45 +02:00
swscale-test.c Merge remote-tracking branch 'qatar/master' 2012-01-14 02:22:09 +01:00
swscale.c Merge remote-tracking branch 'qatar/master' 2012-04-13 21:50:37 +02:00
swscale.h Merge remote-tracking branch 'qatar/master' 2012-01-10 03:50:41 +01:00
utils.c Merge remote-tracking branch 'qatar/master' 2012-04-13 21:50:37 +02:00
yuv2rgb.c Merge remote-tracking branch 'qatar/master' 2012-02-23 04:31:55 +01:00