[FFmpeg-cvslog] Merge commit '02484d1a9316a9309fc1830825345ab79f6a8d60'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Oct 20 21:16:20 2014 +0200| [54112629f196473d6f6423accf5c7291972da0de] | committer: Michael Niedermayer

Merge commit '02484d1a9316a9309fc1830825345ab79f6a8d60'

* commit '02484d1a9316a9309fc1830825345ab79f6a8d60':
  avio: fix sizeof argument

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

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