ffmpeg/libavformat
Michael Niedermayer 24823a761c Merge remote-tracking branch 'qatar/master'
* qatar/master:
  qdm2: remove broken and disabled dump_context() debug function
  x86: h264_intrapred: use newly introduced SPLAT* and PSHUFLW macros
  x86inc: add SPLATB_LOAD, SPLATB_REG, PSHUFLW macros
  x86inc: modify ALIGN to not generate long nops on i586
  x86: h264_intrapred: port to cpuflag macros
  avplay: update input filter pointer when the filtergraph is reset.
  avconv: fix parsing of -force_key_frames option.
  h264: use templates to avoid excessive inlining
  xtea: Make the count parameter match the documentation
  blowfish: Make the count parameter match the documentation
  mpegvideo: Don't use ff_mspel_motion() for vc1
  xtea: invert branch and loop precedence
  blowfish: invert branch and loop precedence
  flvdec: optionally trust the metadata
  avconv: Set audio filter time base to the sample rate
  vp8: Add ifdef guards around the sse2 loopfilter in the sse2slow branch too

Conflicts:
	ffmpeg.c
	ffplay.c
	libavcodec/h264.c
	libavcodec/mpegvideo_common.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-05 21:55:31 +02:00
..
2012-07-01 20:59:37 +02:00
2012-07-05 02:54:34 +00:00
2011-11-05 16:51:25 +01:00
2012-06-19 16:26:01 +00:00
2012-06-17 17:10:05 +02:00
2011-12-19 11:57:34 +01:00
2012-06-20 01:56:03 +00:00
2012-06-15 19:44:42 +02:00
2012-06-09 10:57:14 +00:00
2012-03-03 04:30:49 +01:00
2011-08-01 00:58:49 +02:00
2012-05-10 04:17:03 +02:00
2011-12-30 20:00:53 +01:00
2012-05-31 23:50:08 +02:00
2011-08-09 19:56:25 +02:00
2012-05-07 02:42:00 +02:00
2012-06-16 17:59:01 +02:00
2012-05-20 16:29:08 +02:00
2012-04-06 08:32:09 +02:00
2012-06-11 07:35:14 +02:00
2012-07-03 09:53:42 +00:00
2012-05-21 08:51:50 +02:00
2012-03-31 12:37:42 +02:00
2012-07-05 02:54:34 +00:00
2011-04-04 01:29:40 +02:00
2011-04-20 04:48:23 +02:00
2012-06-11 07:35:14 +02:00
2012-06-13 18:51:38 +02:00
2012-03-10 18:01:03 +01:00
2012-04-19 15:08:13 +02:00
2012-07-05 13:34:49 +02:00
2012-07-05 04:23:55 +02:00
2012-06-15 19:44:42 +02:00
2012-04-18 15:30:34 +02:00
2012-02-29 14:26:14 +01:00
2012-07-05 02:54:34 +00:00
2012-06-14 23:52:23 +02:00
2012-02-28 07:20:36 +01:00
2012-06-14 23:52:40 +02:00
2012-06-21 20:52:56 +02:00
2012-06-29 20:22:04 +02:00
2012-07-04 04:17:00 +02:00
2012-06-29 20:21:28 +02:00
2012-02-23 16:00:22 +01:00
2012-06-21 12:14:53 +00:00
2012-06-21 20:52:56 +02:00
2012-05-18 23:34:11 +02:00
2012-04-03 19:12:52 +02:00
2012-06-07 21:30:07 +02:00
2012-06-28 10:12:04 +02:00
2011-12-30 20:00:53 +01:00
2012-07-05 02:54:34 +00:00
2012-06-25 16:20:08 +03:00
2012-06-07 21:09:06 +02:00