[FFmpeg-cvslog] Merge commit 'fc739b3eefa0b58d64e7661621da94a94dbc8a82'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Sep 30 01:21:30 2013 +0200| [7d7fb61e0df7791c6dbdc1a5aeda63f6f47bf8a8] | committer: Michael Niedermayer

Merge commit 'fc739b3eefa0b58d64e7661621da94a94dbc8a82'

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

Conflicts:
	libavcodec/xan.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7d7fb61e0df7791c6dbdc1a5aeda63f6f47bf8a8
---