Merge remote branch 'qatar/master'

* qatar/master:
  swscale: properly inline bits/endianness in yuv2yuvX16inC().
(We didnt pull the bug)  swscale: fix clipping of 9/10bit YUV420P.
  Add av_clip_uintp2() function
(our patch / duplicate)  dfa: fix buffer overflow checks to avoid integer overflows.
(our patch / duplicate)  movenc: always write esds descriptor length using 4 bytes.
(our patch / duplicate)  ffmpeg: use parse_number_and_die() when it makes sense
(No thanks)  ffmpeg: get rid of the 'q' key schizofrenia

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

diff --cc libavcodec/vp8.c
Simple merge

diff --cc libavutil/common.h
Simple merge

diff --cc libswscale/swscale.c
index 1637918,f5c4e88..c727408
--- 1/libswscale/swscale.c
--- 2/libswscale/swscale.c
+++ b/libswscale/swscale.c
@@@ -366,7 -216,22 +366,21 @@@ static av_always_inline void yuv2yuvX16
  {
      //FIXME Optimize (just quickly written not optimized..)
      int i;
 -    int shift = 11 + 16 - output_bits;
  
+ #define output_pixel(pos, val) \
+     if (big_endian) { \
+         if (output_bits == 16) { \
+             AV_WB16(pos, av_clip_uint16(val >> shift)); \
+         } else { \
+             AV_WB16(pos, av_clip_uintp2(val >> shift, output_bits)); \
+         } \
+     } else { \
+         if (output_bits == 16) { \
+             AV_WL16(pos, av_clip_uint16(val >> shift)); \
+         } else { \
+             AV_WL16(pos, av_clip_uintp2(val >> shift, output_bits)); \
+         } \
+     }
      for (i = 0; i < dstW; i++) {
          int val = 1 << 10;
          int j;