[FFmpeg-cvslog] Merge commit '25c7db7cc99d74fe6fb56a6fd52c9b5f1591e448'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Oct 29 20:06:27 2013 +0100| [e166b82dd483754adad89bb0e5c684cb61e4c281] | committer: Michael Niedermayer

Merge commit '25c7db7cc99d74fe6fb56a6fd52c9b5f1591e448'

* commit '25c7db7cc99d74fe6fb56a6fd52c9b5f1591e448':
  avio: Check for memory allocation failure of private data

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

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