OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2fbf393
)
lavc/videotoolboxenc: Handle out-of-memory and fix memory leak
author
Rick Kern
<kernrj@gmail.com>
Wed, 27 Apr 2016 14:53:10 +0000
(10:53 -0400)
committer
wm4
<nfxjfg@googlemail.com>
Wed, 4 May 2016 16:40:40 +0000
(18:40 +0200)
Signed-off-by: Rick Kern <kernrj@gmail.com>
libavcodec/videotoolboxenc.c
patch
|
blob
|
history
diff --git
a/libavcodec/videotoolboxenc.c
b/libavcodec/videotoolboxenc.c
index
72c7ba8
..
f53015a
100644
(file)
--- a/
libavcodec/videotoolboxenc.c
+++ b/
libavcodec/videotoolboxenc.c
@@
-706,9
+706,14
@@
static av_cold int vtenc_init(AVCodecContext *avctx)
CFNumberRef interval = CFNumberCreate(kCFAllocatorDefault,
kCFNumberIntType,
&avctx->gop_size);
+ if (!interval) {
+ return AVERROR(ENOMEM);
+ }
+
status = VTSessionSetProperty(vtctx->session,
kVTCompressionPropertyKey_MaxKeyFrameInterval,
interval);
+ CFRelease(interval);
if (status) {
av_log(avctx, AV_LOG_ERROR, "Error setting 'max key-frame interval' property: %d\n", status);