Merge commit 'fc739b3eefa0b58d64e7661621da94a94dbc8a82'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 29 Sep 2013 23:21:30 +0000 (01:21 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 29 Sep 2013 23:21:30 +0000 (01:21 +0200)
commit7d7fb61e0df7791c6dbdc1a5aeda63f6f47bf8a8
treebdb640c68ae13e91e5c0a045cb89ed9283db89ea
parentb6dfb829132d17d4a8188b06da3bc91dd951fb53
parentfc739b3eefa0b58d64e7661621da94a94dbc8a82
Merge commit 'fc739b3eefa0b58d64e7661621da94a94dbc8a82'

* commit 'fc739b3eefa0b58d64e7661621da94a94dbc8a82':
  xan: Only read within the data that actually was initialized

Conflicts:
libavcodec/xan.c

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