aboutsummaryrefslogtreecommitdiffstats
path: root/ffprobe.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-12-30 13:29:47 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-12-30 13:29:51 +0100
commit905bac2cd30d445cd84779068cb168a578511912 (patch)
tree0caa82ec70f5600fd3c630ffbefeee7468057e67 /ffprobe.c
parent3cc0f335fe14d05f6f403b09586545f73cc16bc6 (diff)
parent2ebaadf35c9387610ca1eb7e94c171050562a77c (diff)
downloadffmpeg-905bac2cd30d445cd84779068cb168a578511912.tar.gz
Merge remote-tracking branch 'cigaes/master'
* cigaes/master: lavc/mjpegenc: use proper error codes. lavc/mjpegenc: check av_frame_alloc() failure. lavc/libopenjpegenc: check av_frame_alloc() failure. lavc/diracdec: check av_frame_alloc() failure. lavc/utils: check av_frame_alloc() failure. ffprobe: check av_frame_alloc() failure. lavc/ffwavesynth: fix dependency sizeof(AVFrame). Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffprobe.c')
-rw-r--r--ffprobe.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/ffprobe.c b/ffprobe.c
index 0374d372ab..ef3bcc63f6 100644
--- a/ffprobe.c
+++ b/ffprobe.c
@@ -1887,6 +1887,10 @@ static int read_interval_packets(WriterContext *w, AVFormatContext *fmt_ctx,
}
frame = av_frame_alloc();
+ if (!frame) {
+ ret = AVERROR(ENOMEM);
+ goto end;
+ }
while (!av_read_frame(fmt_ctx, &pkt)) {
if (selected_streams[pkt.stream_index]) {
AVRational tb = fmt_ctx->streams[pkt.stream_index]->time_base;