1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
FFmpeg/libswscale
Michael Niedermayer 9f088a1ed4 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  mpegvideo: reduce excessive inlining of mpeg_motion()
  mpegvideo: convert mpegvideo_common.h to a .c file
  build: factor out mpegvideo.o dependencies to CONFIG_MPEGVIDEO
  Move MASK_ABS macro to libavcodec/mathops.h
  x86: move MANGLE() and related macros to libavutil/x86/asm.h
  x86: rename libavutil/x86_cpu.h to libavutil/x86/asm.h
  aacdec: Don't fall back to the old output configuration when no old configuration is present.
  rtmp: Add message tracking
  rtsp: Support mpegts in raw udp packets
  rtsp: Support receiving plain data over UDP without any RTP encapsulation
  rtpdec: Remove an unused include
  rtpenc: Remove an av_abort() that depends on user-supplied data
  vsrc_movie: discourage its use with avconv.
  avconv: allow no input files.
  avconv: prevent invalid reads in transcode_init()
  avconv: rename OutputStream.is_past_recording_time to finished.

Conflicts:
	configure
	doc/filters.texi
	ffmpeg.c
	ffmpeg.h
	libavcodec/Makefile
	libavcodec/aacdec.c
	libavcodec/mpegvideo.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-09 19:31:56 +02:00
..
bfin Merge remote-tracking branch 'qatar/master' 2012-06-20 20:47:46 +02:00
ppc Merge remote-tracking branch 'qatar/master' 2012-07-23 21:25:09 +02:00
sparc Merge remote-tracking branch 'qatar/master' 2012-07-23 21:25:09 +02:00
x86 Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00
colorspace-test.c swscale: unscaled rgba64->rgb48 2012-07-19 00:17:16 +00:00
input.c swscale/input: silence warnings about incompatible pointer types 2012-07-19 15:49:21 +00:00
libswscale.v
Makefile Merge remote-tracking branch 'qatar/master' 2012-07-04 21:03:28 +02:00
options.c lavu: 256 color support 2012-07-07 01:41:55 +00:00
output.c Merge remote-tracking branch 'qatar/master' 2012-07-23 21:25:09 +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-07-23 21:25:09 +02:00
rgb2rgb.h swscale: unscaled rgba64->rgb48 2012-07-19 00:17:16 +00:00
swscale_internal.h sws: support 12&14 bit planar colorspaces 2012-07-04 23:47:01 +02:00
swscale_unscaled.c swscale: unscaled rgba64->rgb48 2012-07-19 00:17:16 +00:00
swscale-test.c
swscale.c Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
swscale.h Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
utils.c Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00
version.h Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
yuv2rgb.c yuv2rgb: implement 15/16bit ordered dither 2012-07-17 14:25:49 +02:00