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
..
audio_convert.asm	swr/x86: 10l, missed some SSE2 instructions in code marked as SSE.	2012-07-05 15:28:10 +02:00
Makefile	swr: SIMD rematrixing and SSE/AVX mix_1_1 float	2012-06-12 16:35:07 +02:00
rematrix.asm	swr/x86: 16bit integer mix functions need SSE2 not SSE	2012-07-07 20:52:34 +02:00
resample_mmx.h	Merge remote-tracking branch 'qatar/master'	2012-08-09 19:31:56 +02:00
swresample_x86.c	swr/x86: 16bit integer mix functions need SSE2 not SSE	2012-07-07 20:52:34 +02:00