summaryrefslogtreecommitdiff
path: root/ffmpeg/libavformat/libnut.c
diff options
context:
space:
mode:
authorTim Redfern <tim@eclectronics.org>2013-12-29 12:19:38 +0000
committerTim Redfern <tim@eclectronics.org>2013-12-29 12:19:38 +0000
commitf7813a5324be39d13ab536c245d15dfc602a7849 (patch)
treefad99148b88823d34a5df2f0a25881a002eb291b /ffmpeg/libavformat/libnut.c
parentb7a5a477b8ff4d4e3028b9dfb9a9df0a41463f92 (diff)
basic type mechanism working
Diffstat (limited to 'ffmpeg/libavformat/libnut.c')
-rw-r--r--ffmpeg/libavformat/libnut.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/ffmpeg/libavformat/libnut.c b/ffmpeg/libavformat/libnut.c
index 838c55a..be8f3cb 100644
--- a/ffmpeg/libavformat/libnut.c
+++ b/ffmpeg/libavformat/libnut.c
@@ -223,14 +223,16 @@ static int nut_read_header(AVFormatContext * avf) {
AVStream * st = avformat_new_stream(avf, NULL);
int j;
+ if (!st)
+ return AVERROR(ENOMEM);
+
for (j = 0; j < s[i].fourcc_len && j < 8; j++) st->codec->codec_tag |= s[i].fourcc[j]<<(j*8);
st->codec->has_b_frames = s[i].decode_delay;
st->codec->extradata_size = s[i].codec_specific_len;
if (st->codec->extradata_size) {
- st->codec->extradata = av_mallocz(st->codec->extradata_size);
- if(!st->codec->extradata){
+ if(ff_alloc_extradata(st->codec, st->codec->extradata_size)){
nut_demuxer_uninit(nut);
priv->nut = NULL;
return AVERROR(ENOMEM);