aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-06-01 11:55:41 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-06-01 11:59:02 +0200
commit3c536bee54cad7e5686f0383d1dce7cf18bd4db4 (patch)
tree139a8a0c52a8dfefe5b42cfef37b1c9aa0f7802f /ffmpeg.c
parent4a620243b9618a75d3edbb436e102e944b55cede (diff)
parent891ed1184e49bc7944311302d9ece01e87c188a8 (diff)
downloadffmpeg-3c536bee54cad7e5686f0383d1dce7cf18bd4db4.tar.gz
Merge commit '891ed1184e49bc7944311302d9ece01e87c188a8' into release/2.2
* commit '891ed1184e49bc7944311302d9ece01e87c188a8': libvpx: Fix mixed use of av_malloc() and av_reallocp() Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions