-
Michael Niedermayer authored
* commit '30db94dc': xan: Use bytestream2 to limit reading to within the buffer Conflicts: libavcodec/xan.c Merged-by:
Michael Niedermayer <michaelni@gmx.at>
b6dfb829
* commit '30db94dc': xan: Use bytestream2 to limit reading to within the buffer Conflicts: libavcodec/xan.c Merged-by:Michael Niedermayer <michaelni@gmx.at>