FFmpeg/libavformat
Michael Niedermayer bff2afb3e9 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  x86: dsputil: Only compile motion_est code when encoders are enabled
  mem: fix typo in check for __ICC
  fate: mp3: drop redundant CMP setting
  rtp: Depacketization of JPEG (RFC 2435)
  Rename ff_put_string to avpriv_put_string
  mjpeg: Rename some symbols to avpriv_* instead of ff_*
  yadif: cosmetics

Conflicts:
	Changelog
	libavcodec/mjpegenc.c
	libavcodec/x86/Makefile
	libavfilter/vf_yadif.c
	libavformat/version.h
	libavutil/mem.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-10 14:06:20 +02:00
..
2012-08-30 05:17:24 +02:00
2012-08-14 16:54:25 +02:00
2012-08-18 17:45:58 +02:00
2012-09-08 02:28:20 +02:00
2012-08-07 23:57:21 +02:00
2012-08-31 23:27:27 +02:00
2012-08-18 05:02:58 +02:00
2012-09-09 20:23:14 +02:00
2012-08-21 01:52:55 +02:00
2012-07-06 17:08:22 +02:00
2012-07-06 17:08:22 +02:00
2012-08-14 16:54:25 +02:00
2012-08-21 06:13:54 +02:00
2012-08-16 10:20:25 +02:00
2012-08-27 05:23:42 +02:00
2012-08-26 22:15:20 +02:00
2012-08-26 22:15:21 +02:00
2012-07-20 11:16:52 +02:00
2012-09-06 04:42:43 +02:00
2012-09-01 23:45:32 +02:00
2012-08-07 23:57:21 +02:00
2012-09-03 22:40:41 +02:00
2012-08-28 22:29:20 +02:00
2012-07-25 20:31:16 +03:00
2012-08-29 00:28:07 +02:00
2012-08-29 00:05:03 +02:00
2012-08-07 23:57:21 +02:00