[FFmpeg-cvslog] Merge commit 'f099d3d1d5466bd63f4ab36270d169ff9ea613b8'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 14 12:02:43 2013 +0100| [905e7eb41389e4394e9c6e459b7d1a99dc30b075] | committer: Michael Niedermayer

Merge commit 'f099d3d1d5466bd63f4ab36270d169ff9ea613b8'

* commit 'f099d3d1d5466bd63f4ab36270d169ff9ea613b8':
  Add av_log_{ask_for_sample|missing_feature} replacements to libavutil
  ismindex: Check the return value of allocations

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

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