Merge remote-tracking branch 'qatar/master'

* qatar/master: (22 commits)
  H.264: fix filter_mb_fast with 4:4:4 + 8x8dct
  alsa: limit buffer_size to 32768 frames.
  alsa: fallback to buffer_size/4 for period_size.
  doc: replace @pxref by @ref where appropriate
  mpeg1video: don't abort if thread_count is too high.
  segafilm: add support for videos with cri adx adpcm
  gxf: Fix 25 fps DV material in GXF being misdetected as 50 fps
  libxvid: Add const qualifier to silence compiler warning.
  H.264: improve qp_thresh check
  H.264: use fill_rectangle in CABAC decoding
  H.264: Remove redundant hl_motion_16/8 code
  H.264: merge fill_rectangle into P-SKIP MV prediction, to match B-SKIP
  H.264: faster P-SKIP decoding
  H.264: av_always_inline some more functions
  H.264: Add x86 assembly for 10-bit H.264 predict functions
  swscale: rename uv_off/uv_off2 to uv_off_px/byte.
  swscale: implement error dithering in planarCopyWrapper.
  swscale: error dithering for 16/9/10-bit to 8-bit.
  swscale: fix overflow in 16-bit vertical scaling.
  swscale: fix crash in 8-bpc bilinear output without alpha.
  ...

Conflicts:
	doc/developer.texi
	libavdevice/alsa-audio.h
	libavformat/gxf.c
	libswscale/swscale.c
	libswscale/swscale_internal.h
	libswscale/swscale_unscaled.c
	libswscale/x86/swscale_template.c
	tests/ref/lavfi/pixdesc
	tests/ref/lavfi/pixfmts_copy
	tests/ref/lavfi/pixfmts_crop
	tests/ref/lavfi/pixfmts_hflip
	tests/ref/lavfi/pixfmts_null
	tests/ref/lavfi/pixfmts_scale
	tests/ref/lavfi/pixfmts_vflip

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

diff --cc doc/developer.texi
index c1ca096ddf1bf19309da36d014f9244cb69a8c4d,cae4f3df5ea1b49766a911b31acf4b386d85772c..7701942d1192375688e7844ed6bee9292d49aa2b
--- 1/doc/developer.texi
--- 2/doc/developer.texi
+++ b/doc/developer.texi
@@@ -244,23 -224,22 +244,24 @@@ Note, these rules are mostly borrowed f
  
  @section Submitting patches
  
- First, read the (@pxref{Coding Rules}) above if you did not yet.
+ First, read the @ref{Coding Rules} above if you did not yet, in particular
+ the rules regarding patch submission.
  
 -As stated already, please do not submit a patch which contains several
 -unrelated changes.
 +When you submit your patch, please use @code{git format-patch} or
 +@code{git send-email}. We cannot read other diffs :-)
 +
 +Also please do not submit a patch which contains several unrelated changes.
  Split it into separate, self-contained pieces. This does not mean splitting
  file by file. Instead, make the patch as small as possible while still
  keeping it as a logical unit that contains an individual change, even
  if it spans multiple files. This makes reviewing your patches much easier
  for us and greatly increases your chances of getting your patch applied.
  
 -Use the patcheck tool of Libav to check your patch.
 +Use the patcheck tool of FFmpeg to check your patch.
  The tool is located in the tools directory.
  
- Run the regression tests before submitting a patch so that you can
- verify that there are no big problems.
+ Run the @ref{Regression Tests} before submitting a patch in order to verify
+ it does not cause unexpected problems.
  
  Patches should be posted as base64 encoded attachments (or any other
  encoding which ensures that the patch will not be trashed during

diff --cc doc/filters.texi
Simple merge

diff --cc doc/muxers.texi
Simple merge

diff --cc libavcodec/h264.c
Simple merge

diff --cc libavcodec/h264.h
Simple merge

diff --cc libavcodec/h264_cabac.c
Simple merge

diff --cc libavcodec/h264_loopfilter.c
Simple merge

diff --cc libavcodec/h264_mvpred.h
Simple merge

diff --cc libavcodec/libxvidff.c
Simple merge

diff --cc libavcodec/mpegvideo.c
index d819cc083f8b46a66ef94ac7adbd66f552923d68,aec75b541e99c8e68b154b30173d595788c9dfa2..170620bd952e5342a12e7f9480890768cf363bf3
--- 1/libavcodec/mpegvideo.c
--- 2/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@@ -746,9 -756,8 +752,7 @@@ av_cold int MPV_common_init(MpegEncCont
      s->context_initialized = 1;
      s->thread_context[0]= s;
  
 -    if (s->width && s->height) {
      if (s->encoding || (HAVE_THREADS && s->avctx->active_thread_type&FF_THREAD_SLICE)) {
-         threads = s->avctx->thread_count;
- 
          for(i=1; i<threads; i++){
              s->thread_context[i]= av_malloc(sizeof(MpegEncContext));
              memcpy(s->thread_context[i], s, sizeof(MpegEncContext));

diff --cc libavcodec/x86/dsputil_mmx.c
Simple merge

diff --cc libavcodec/x86/h264_intrapred_init.c
Simple merge

diff --cc libavcodec/x86/x86util.asm
Simple merge

diff --cc libavdevice/alsa-audio-common.c
Simple merge

diff --cc libavdevice/alsa-audio.h
index 022663247987044196b7141530394c6e79d708af,ee43463696210ac86dc76888124efed3eec9f591..ab60e73c59e4ae08fd0b086b0ce2b6e31444a075
--- 1/libavdevice/alsa-audio.h
--- 2/libavdevice/alsa-audio.h
+++ b/libavdevice/alsa-audio.h
@@@ -41,8 -40,8 +41,10 @@@
          other formats */
  #define DEFAULT_CODEC_ID AV_NE(CODEC_ID_PCM_S16BE, CODEC_ID_PCM_S16LE)
  
 +typedef void (*ff_reorder_func)(const void *, void *, int);
 +
+ #define ALSA_BUFFER_SIZE_MAX 32768
+ 
  typedef struct {
      AVClass *class;
      snd_pcm_t *h;

diff --cc libavformat/gxf.c
Simple merge

diff --cc libavformat/segafilm.c
Simple merge