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-22 16:41:57 -04:00
2012-07-10 00:04:23 +00:00
2012-05-09 14:13:34 +01:00
2012-07-10 00:04:24 +00:00
2012-05-09 14:13:34 +01:00
2012-05-09 14:13:34 +01:00
2012-07-23 22:12:12 +02:00
2012-09-10 00:07:24 +01:00
2012-09-02 18:15:08 +02:00
2012-06-18 11:47:08 +01:00