Merge commit 'fb845ffdd335a1efd6dfd43e8adeb530397b348e'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 16 Jan 2013 11:01:21 +0000 (12:01 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 16 Jan 2013 11:01:21 +0000 (12:01 +0100)
commit06af724c56c9fd74bb6ace457f39e1768bd94246
tree98871df0ad86390c47e9a6c2fbb6ab2cfa947934
parent68f92a70f1f486c8bc01a1e747a017a6f8dd6861
parentfb845ffdd335a1efd6dfd43e8adeb530397b348e
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@gmx.at>
libavcodec/dvdsubdec.c