* qatar/master: (31 commits)
  libx264: set default thread count to 0 (auto)
  lavc: cosmetics, group deprecated codec flags
  mpeg12: add 'scan_offset' private option.
  h263/p encoder: add 'structured_slices' private option.
  h263/p encoder: add 'obmc' private option.
  h263p encoder: add 'aiv' private option.
  h263p encoder: add 'umv' private option.
  mpeg12enc/mpeg4videoenc: add 'alternate_scan' private option.
  mjpegdec: add 'extern_huff' private option.
  mpeg4enc: add 'data_partitioning' private option.
  snow: add 'memc_only' private option.
  libx264: add 'mbtree' private option.
  libx264: add 'psy' private option.
  libmp3lame: add 'reservoir' private option.
  mpeg2enc: add 'non_linear_quant' private option
  mpeg12enc: add drop_frame_timecode private option.
  mpeg12enc: add intra_vlc private option.
  VC1: Support dynamic dimension changes
  mjpeg: treat external huffman table setup failure as codec init failure if external huffman table use requested
  lavc: deprecate CODEC_FLAG2_BRDO
  ...

Conflicts:
	avconv.c
	libavcodec/libmp3lame.c
	libavcodec/libx264.c
	libavcodec/mjpegdec.c
	libavcodec/mpeg12enc.c
	libavcodec/mpegvideo.h
	libavcodec/vc1.c
	libavcodec/vc1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Deprecate CODEC_FLAG_SVCD_SCAN_OFFSET

Deprecate CODEC_FLAG_H263P_SLICE_STRUCT

Deprecate CODEC_FLAG_OBMC

Deprecate CODEC_FLAG_H263P_AIV

Deprecate CODEC_FLAG_H263P_UMV

Deprecate CODEC_FLAG_ALT_SCAN

Deprecate CODEC_FLAG_EXTERN_HUFF

Deprecate CODEC_FLAG_PART

Deprecate CODEC_FLAG2_MEMC_ONLY

Deprecate CODEC_FLAG2_MBTREE

Deprecate CODEC_FLAG2_PSY

Deprecate CODEC_FLAG2_BIT_RESERVOIR

Deprecate CODEC_FLAG2_NON_LINEAR_QUANT

Deprecate CODEC_FLAG2_DROP_FRAME_TIMECODE

Deprecate CODEC_FLAG2_INTRA_VLC.

Fixes SA00072, SA00073, SA10150, SA10151, Issue2076

Improves SA10153
Signed-off-by: Anton Khirnov <anton@khirnov.net>

mjpeg: treat external huffman table setup failure as codec init failure if external huffman table use requested
Signed-off-by: Anton Khirnov <anton@khirnov.net>

It's been unused for the last 3 years.

Deprecate CODEC_FLAG2_AUD.

Deprecate CODEC_FLAG2_FASTPSKIP.

Deprecate CODEC_FLAG2_8X8DCT.

Deprecate CODEC_FLAG2_MIXED_REFS.

Deprecate CODEC_FLAG2_BPYRAMID.

Deprecate CODEC_FLAG2_BPYRAMID.

Deprecate CODEC_FLAG2_INTRA_REFRESH.

Deprecate CODEC_FLAG2_SSIM.

Replace '_' with '-', merge psy-trellis into psy-rd and rename cqp->qp
Also fix typo pdy-rd -> psy-rd

coded_width is the width before lowres scaling,
coded_height is the height before lowres scaling.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f593628e':
  avconv: Replace raw picture frame swapping hack.
  RV40: reuse some H.264 motion compensation functions in RV40.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

the basetime argument also enables useage of pts instead of time()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This makes it easier to refer to filters where things are seperated by spaces.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>