mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '6308cd4868d2bd5fdf8bfa8dd10856c9a91874f5'
* commit '6308cd4868d2bd5fdf8bfa8dd10856c9a91874f5': mov: Check memory allocation Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
3d6635749a
|
@ -1852,6 +1852,10 @@ static int mov_finalize_stsd_codec(MOVContext *c, AVIOContext *pb,
|
|||
#if CONFIG_DV_DEMUXER
|
||||
case AV_CODEC_ID_DVAUDIO:
|
||||
c->dv_fctx = avformat_alloc_context();
|
||||
if (!c->dv_fctx) {
|
||||
av_log(c->fc, AV_LOG_ERROR, "dv demux context alloc error\n");
|
||||
return AVERROR(ENOMEM);
|
||||
}
|
||||
c->dv_demux = avpriv_dv_init_demux(c->dv_fctx);
|
||||
if (!c->dv_demux) {
|
||||
av_log(c->fc, AV_LOG_ERROR, "dv demux context init error\n");
|
||||
|
|
Loading…
Reference in New Issue