OSDN Git Service

Merge commit '30db94dc399f6e4ef8905049d9b740556f0fce47'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 29 Sep 2013 23:09:38 +0000 (01:09 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 29 Sep 2013 23:12:15 +0000 (01:12 +0200)
commitb6dfb829132d17d4a8188b06da3bc91dd951fb53
tree9a4ea31688e1c76ba0ff6c27cce49d1b20989181
parenta612bb3099eb0319567c3d682253782bee1d52de
parent30db94dc399f6e4ef8905049d9b740556f0fce47
Merge commit '30db94dc399f6e4ef8905049d9b740556f0fce47'

* commit '30db94dc399f6e4ef8905049d9b740556f0fce47':
  xan: Use bytestream2 to limit reading to within the buffer

Conflicts:
libavcodec/xan.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/xan.c