Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 10 Sep 2012 12:05:42 +0000 (14:05 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 10 Sep 2012 12:06:20 +0000 (14:06 +0200)
commitbff2afb3e978c9cdffdd03a2571e4f6ddab74731
tree7a92225c964848221a8be28232d1f6137475eb66
parente4fe4d01fc31bfdabf6f9b106c633139287a400d
parenta84edbacaf5adbe6e3672851aa8b3034b95787e2
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>
17 files changed:
Changelog
libavcodec/Makefile
libavcodec/bitstream.c
libavcodec/mjpeg.c
libavcodec/mjpeg.h
libavcodec/mjpeg2jpeg_bsf.c
libavcodec/mjpegdec.c
libavcodec/mjpegenc.c
libavcodec/mpeg4videoenc.c
libavcodec/put_bits.h
libavcodec/x86/Makefile
libavfilter/vf_yadif.c
libavformat/Makefile
libavformat/rtpdec.c
libavformat/rtpdec_formats.h
libavformat/rtpdec_jpeg.c
libavformat/version.h