| 
							
							
								 Michael Niedermayer | e13d5e9a4b | 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@gmx.at> | 2012-11-14 11:59:20 +01:00 |  |