1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
FFmpeg/libswresample
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
..
x86 Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00
audioconvert.c swr: fix warning: passing argument 2 of ctx->simd_f from incompatible pointer type 2012-07-02 17:31:16 +02:00
audioconvert.h
dither.c
libswresample.v
Makefile
rematrix_template.c swr: fix mix* related function pointer warnings 2012-07-02 17:23:22 +02:00
rematrix.c swr: fix warning: passing argument 2 of s->mix_any_f from incompatible pointer type 2012-07-02 17:33:27 +02:00
resample_template.c swr: MMX2 & SSSE3 int16 resample core 2012-06-28 00:36:27 +02:00
resample.c bessel: check that the function terminates as expected by av_assert2(). 2012-08-09 01:44:15 +02:00
swresample_internal.h swr: resampling: add filter type and Kaiser window beta to AVOptions 2012-07-23 19:23:39 +02:00
swresample-test.c swr-test: support "--help" 2012-06-05 17:27:38 +02:00
swresample.c swr: fix 10l typo mixing in and out config. 2012-08-01 21:18:03 +02:00
swresample.h swr: resampling: add filter type and Kaiser window beta to AVOptions 2012-07-23 19:23:39 +02:00