mirror of https://git.ffmpeg.org/ffmpeg.git
* 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> |
||
---|---|---|
.. | ||
bfin | ||
ppc | ||
sparc | ||
x86 | ||
Makefile | ||
colorspace-test.c | ||
input.c | ||
libswscale.v | ||
options.c | ||
output.c | ||
rgb2rgb.c | ||
rgb2rgb.h | ||
rgb2rgb_template.c | ||
swscale-test.c | ||
swscale.c | ||
swscale.h | ||
swscale_internal.h | ||
swscale_unscaled.c | ||
utils.c | ||
version.h | ||
yuv2rgb.c |