ffmpeg/libavcodec
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
..
2012-04-22 22:26:55 +02:00
2012-07-11 04:04:29 +02:00
2012-05-05 22:04:21 +01:00
2012-05-05 22:04:21 +01:00
2012-07-29 22:02:46 +02:00
2012-06-03 01:53:36 +02:00
2012-08-09 00:02:05 +00:00
2012-08-07 03:15:39 +00:00
2012-06-29 20:20:02 +02:00
2012-05-08 00:25:25 +02:00
2012-08-07 23:57:21 +02:00
2012-07-07 12:33:51 +02:00
2012-08-08 01:14:18 +02:00
2012-07-07 12:34:04 +02:00
2012-08-07 23:57:21 +02:00
2012-05-18 23:34:11 +02:00
2012-03-15 22:12:02 +01:00
2012-03-15 22:12:02 +01:00
2012-08-09 11:22:11 +02:00
2012-03-13 01:14:04 +01:00
2012-07-19 18:44:46 +02:00
2012-02-01 04:43:06 +01:00
2012-07-26 16:33:17 +02:00
2012-07-26 16:33:39 +02:00
2012-06-07 21:07:17 +02:00
2012-07-10 02:17:53 +02:00
2012-07-10 02:17:52 +02:00
2012-07-10 02:17:52 +02:00
2012-07-25 21:35:30 +02:00
2012-06-10 23:27:17 +02:00
2012-05-18 23:34:11 +02:00
2012-02-14 01:22:38 +01:00
2012-04-22 22:26:55 +02:00
2012-07-22 05:18:01 +02:00
2012-08-07 22:56:35 +00:00
2012-05-18 23:34:11 +02:00
2012-06-28 00:07:22 +02:00
2012-04-15 18:21:53 +02:00
2012-01-07 00:11:43 +01:00
2011-12-17 05:04:56 +01:00
2012-06-17 17:09:34 +02:00
2012-07-05 02:54:34 +00:00
2012-06-29 20:43:30 +02:00
2012-06-29 20:43:30 +02:00
2012-06-29 20:43:30 +02:00
2012-07-29 22:02:46 +02:00
2012-06-06 21:18:14 +02:00
2012-03-19 18:46:34 +01:00
2012-06-10 23:36:22 +02:00
2012-06-24 20:18:00 +02:00
2012-07-05 04:23:55 +02:00
2012-07-02 20:52:22 +02:00
2012-06-19 17:13:45 +02:00
2012-06-21 01:30:16 +00:00
2012-03-07 10:29:52 -08:00
2012-07-17 01:23:35 +00:00
2012-07-02 20:52:36 +02:00
2012-01-08 20:22:12 +01:00
2012-03-13 01:14:04 +01:00
2012-06-29 20:43:30 +02:00