[FFmpeg-cvslog] Merge commit 'fb845ffdd335a1efd6dfd43e8adeb530397b348e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jan 16 12:01:21 2013 +0100| [06af724c56c9fd74bb6ace457f39e1768bd94246] | committer: Michael Niedermayer

Merge commit 'fb845ffdd335a1efd6dfd43e8adeb530397b348e'

* commit 'fb845ffdd335a1efd6dfd43e8adeb530397b348e':
  h264: add 3 pixels below for subpixel filter wait position
  dvdsubdec: Support palette in mkv

Conflicts:
	libavcodec/dvdsubdec.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=06af724c56c9fd74bb6ace457f39e1768bd94246
---