]> git.sesse.net Git - ffmpeg/commit
Merge commit 'f099d3d1d5466bd63f4ab36270d169ff9ea613b8'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Mar 2013 11:02:43 +0000 (12:02 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Mar 2013 11:15:02 +0000 (12:15 +0100)
commit905e7eb41389e4394e9c6e459b7d1a99dc30b075
tree1d182a4e747144648ab74c4a7dfcc88395aa7c29
parent360d71707f7d3b1c02be857515392a843f159b85
parentf099d3d1d5466bd63f4ab36270d169ff9ea613b8
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@gmx.at>
libavcodec/avcodec.h
libavcodec/utils.c
libavcodec/version.h
libavutil/internal.h
libavutil/log.c
tools/ismindex.c