aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg_opt.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-01-17 22:47:02 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-01-17 22:47:02 +0100
commitdd4adba8112bc972ac6bf4147f7ab3cea4d5a105 (patch)
tree42073075f7e2e5daac535fda57e1ab41688006b0 /ffmpeg_opt.c
parentee910aef38cb1679e7a7b6d9b0126fddbc0b4377 (diff)
parent3280b86c85f5a88397fce0230d1878fee79fbb93 (diff)
downloadffmpeg-dd4adba8112bc972ac6bf4147f7ab3cea4d5a105.tar.gz
Merge commit '3280b86c85f5a88397fce0230d1878fee79fbb93' into release/2.4
* commit '3280b86c85f5a88397fce0230d1878fee79fbb93': swscale: check memory allocations Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
0 files changed, 0 insertions, 0 deletions