Merge remote branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 14 May 2011 00:19:23 +0000 (02:19 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 14 May 2011 00:19:58 +0000 (02:19 +0200)
commit58c03f6d7d6eabdbc25103e8229a06ddf3718bb9
tree9796a7be60b1b305a4e0235ffde5ede275f740b8
parent01d3ebaf219d83c0a70cdf9696ecb6b868e8a165
parent9f54e461fecec7a97ec1b97ae4468135ea770609
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>
libavcodec/vp8.c
libavutil/common.h
libswscale/swscale.c