[FFmpeg-cvslog] Merge commit 'c53b5dda352452e79a9e962cd4c74c813186d9ed'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Sep 20 11:06:09 2013 +0200| [c6526620a9a802e89f92c7f3469a6adbb321970c] | committer: Michael Niedermayer

Merge commit 'c53b5dda352452e79a9e962cd4c74c813186d9ed'

* commit 'c53b5dda352452e79a9e962cd4c74c813186d9ed':
  asfdec: replace magic constant with DATA_HEADER_SIZE

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

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