[FFmpeg-cvslog] Merge commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Nov 14 11:22:40 2012 +0100| [e13d5e9a4b5b4de065b00b1caea850cd47fd4b18] | committer: Michael Niedermayer

Merge commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2'

* commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2':
  x86: h264_weight_10bit: port to cpuflags
  libtheoraenc: add missing pixdesc.h header
  avcodec: remove ff_is_hwaccel_pix_fmt
  pixdesc: add av_pix_fmt_get_chroma_sub_sample
  hlsenc: stand alone hls segmenter

Conflicts:
	doc/muxers.texi
	libavcodec/ffv1enc.c
	libavcodec/imgconvert.c
	libavcodec/mpegvideo_enc.c
	libavcodec/tiffenc.c
	libavformat/Makefile
	libavformat/allformats.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e13d5e9a4b5b4de065b00b1caea850cd47fd4b18
---