diff options
| author | Michael Niedermayer <[email protected]> | 2013-05-28 08:04:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-05-28 08:04:02 +0200 |
| commit | 91db8ff203048e3d6fed589e8352d3a5407d4302 (patch) | |
| tree | 7d770c4048628cb98bc8bbbf9fee45b088711345 /libavutil/ppc | |
| parent | 97f7586cd6a1c3741258d6d70b3cbbbde15b1618 (diff) | |
| parent | 564b7e0c0095768cd20001b28154d69462be54e7 (diff) | |
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 <[email protected]>
Diffstat (limited to 'libavutil/ppc')
0 files changed, 0 insertions, 0 deletions