-
Michael Niedermayer authored
* commit 'fc739b3e': xan: Only read within the data that actually was initialized Conflicts: libavcodec/xan.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
7d7fb61e
* commit 'fc739b3e': xan: Only read within the data that actually was initialized Conflicts: libavcodec/xan.c Merged-by: Michael Niedermayer <michaelni@gmx.at>