aboutsummaryrefslogtreecommitdiffstats
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
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>
-rw-r--r--ffprobe.c4
-rw-r--r--libavcodec/diracdec.c8
-rw-r--r--libavcodec/ffwavesynth.c11
-rw-r--r--libavcodec/libopenjpegenc.c2
-rw-r--r--libavcodec/mjpegenc.c8
-rw-r--r--libavcodec/utils.c4
6 files changed, 26 insertions, 11 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;
diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c
index 5eca4f6fad..d437e14ce5 100644
--- a/libavcodec/diracdec.c
+++ b/libavcodec/diracdec.c
@@ -406,8 +406,14 @@ static av_cold int dirac_decode_init(AVCodecContext *avctx)
ff_dsputil_init(&s->dsp, avctx);
ff_diracdsp_init(&s->diracdsp);
- for (i = 0; i < MAX_FRAMES; i++)
+ for (i = 0; i < MAX_FRAMES; i++) {
s->all_frames[i].avframe = av_frame_alloc();
+ if (!s->all_frames[i].avframe) {
+ while (i > 0)
+ av_frame_free(&s->all_frames[--i].avframe);
+ return AVERROR(ENOMEM);
+ }
+ }
return 0;
}
diff --git a/libavcodec/ffwavesynth.c b/libavcodec/ffwavesynth.c
index a62746d61c..4a5031a8ca 100644
--- a/libavcodec/ffwavesynth.c
+++ b/libavcodec/ffwavesynth.c
@@ -93,7 +93,6 @@ struct wavesynth_context {
int64_t cur_ts;
int64_t next_ts;
int32_t *sin;
- AVFrame frame;
struct ws_interval *inter;
uint32_t dither_state;
uint32_t pink_state;
@@ -341,8 +340,6 @@ static av_cold int wavesynth_init(AVCodecContext *avc)
ws->pink_need += ws->inter[i].type == WS_NOISE;
ws->pink_state = MKTAG('P','I','N','K');
ws->pink_pos = PINK_UNIT;
- avcodec_get_frame_defaults(&ws->frame);
- avc->coded_frame = &ws->frame;
wavesynth_seek(ws, 0);
avc->sample_fmt = AV_SAMPLE_FMT_S16;
return 0;
@@ -428,6 +425,7 @@ static int wavesynth_decode(AVCodecContext *avc, void *rframe, int *rgot_frame,
AVPacket *packet)
{
struct wavesynth_context *ws = avc->priv_data;
+ AVFrame *frame = rframe;
int64_t ts;
int duration;
int s, c, r;
@@ -443,11 +441,11 @@ static int wavesynth_decode(AVCodecContext *avc, void *rframe, int *rgot_frame,
duration = AV_RL32(packet->data + 8);
if (duration <= 0)
return AVERROR(EINVAL);
- ws->frame.nb_samples = duration;
- r = ff_get_buffer(avc, &ws->frame, 0);
+ frame->nb_samples = duration;
+ r = ff_get_buffer(avc, frame, 0);
if (r < 0)
return r;
- pcm = (int16_t *)ws->frame.data[0];
+ pcm = (int16_t *)frame->data[0];
for (s = 0; s < duration; s++, ts++) {
memset(channels, 0, avc->channels * sizeof(*channels));
if (ts >= ws->next_ts)
@@ -458,7 +456,6 @@ static int wavesynth_decode(AVCodecContext *avc, void *rframe, int *rgot_frame,
}
ws->cur_ts += duration;
*rgot_frame = 1;
- *(AVFrame *)rframe = ws->frame;
return packet->size;
}
diff --git a/libavcodec/libopenjpegenc.c b/libavcodec/libopenjpegenc.c
index 0205c7df81..e056dd7b95 100644
--- a/libavcodec/libopenjpegenc.c
+++ b/libavcodec/libopenjpegenc.c
@@ -502,6 +502,8 @@ static int libopenjpeg_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
case AV_PIX_FMT_GBRP14:
case AV_PIX_FMT_GBRP16:
gbrframe = av_frame_alloc();
+ if (!gbrframe)
+ return AVERROR(ENOMEM);
av_frame_ref(gbrframe, frame);
gbrframe->data[0] = frame->data[2]; // swap to be rgb
gbrframe->data[1] = frame->data[0];
diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c
index f23343af84..518a7d56a4 100644
--- a/libavcodec/mjpegenc.c
+++ b/libavcodec/mjpegenc.c
@@ -48,12 +48,12 @@ av_cold int ff_mjpeg_encode_init(MpegEncContext *s)
if (s->width > 65500 || s->height > 65500) {
av_log(s, AV_LOG_ERROR, "JPEG does not support resolutions above 65500x65500\n");
- return -1;
+ return AVERROR(EINVAL);
}
m = av_malloc(sizeof(MJpegContext));
if (!m)
- return -1;
+ return AVERROR(ENOMEM);
s->min_qcoeff=-1023;
s->max_qcoeff= 1023;
@@ -545,9 +545,11 @@ static int amv_encode_picture(AVCodecContext *avctx, AVPacket *pkt,
//CODEC_FLAG_EMU_EDGE have to be cleared
if(s->avctx->flags & CODEC_FLAG_EMU_EDGE)
- return -1;
+ return AVERROR(EINVAL);
pic = av_frame_alloc();
+ if (!pic)
+ return AVERROR(ENOMEM);
av_frame_ref(pic, pic_arg);
//picture should be flipped upside-down
for(i=0; i < 3; i++) {
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index c000d27155..f6601332ce 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1721,6 +1721,8 @@ int attribute_align_arg avcodec_encode_audio(AVCodecContext *avctx,
if (samples) {
frame = av_frame_alloc();
+ if (!frame)
+ return AVERROR(ENOMEM);
if (avctx->frame_size) {
frame->nb_samples = avctx->frame_size;
@@ -2158,6 +2160,8 @@ int attribute_align_arg avcodec_decode_audio3(AVCodecContext *avctx, int16_t *sa
AVFrame *frame = av_frame_alloc();
int ret, got_frame = 0;
+ if (!frame)
+ return AVERROR(ENOMEM);
if (avctx->get_buffer != avcodec_default_get_buffer) {
av_log(avctx, AV_LOG_ERROR, "Custom get_buffer() for use with"
"avcodec_decode_audio3() detected. Overriding with avcodec_default_get_buffer\n");