Merge commit '564b7e0c0095768cd20001b28154d69462be54e7'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 28 May 2013 06:04:02 +0000 (08:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 28 May 2013 06:04:02 +0000 (08:04 +0200)
commit91db8ff203048e3d6fed589e8352d3a5407d4302
tree7d770c4048628cb98bc8bbbf9fee45b088711345
parent97f7586cd6a1c3741258d6d70b3cbbbde15b1618
parent564b7e0c0095768cd20001b28154d69462be54e7
Merge commit '564b7e0c0095768cd20001b28154d69462be54e7'

* commit '564b7e0c0095768cd20001b28154d69462be54e7':
  matroskadec: silently skip CodecState element.
  smacker: fix off-by-one error in palette expanding code

Conflicts:
libavformat/smacker.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/matroska.h
libavformat/matroskadec.c
libavformat/smacker.c