*/
#include "libavutil/channel_layout.h"
+#include "libavutil/imgutils.h"
#include "libavutil/intreadwrite.h"
#include "avformat.h"
#include "internal.h"
{
BVID_DemuxContext *vid = s->priv_data;
AVIOContext *pb = s->pb;
+ int ret;
/* load main header. Contents:
* bytes: 'V' 'I' 'D'
vid->bethsoft_global_delay = avio_rl16(pb);
avio_rl16(pb);
+ ret = av_image_check_size(vid->width, vid->height, 0, s);
+ if (ret < 0)
+ return ret;
+
// wait until the first packet to create each stream
vid->video_index = -1;
vid->audio_index = -1;
}
do{
- vidbuf_start = av_fast_realloc(vidbuf_start, &vidbuf_capacity, vidbuf_nbytes + BUFFER_PADDING_SIZE);
- if(!vidbuf_start)
- return AVERROR(ENOMEM);
+ uint8_t *tmp = av_fast_realloc(vidbuf_start, &vidbuf_capacity,
+ vidbuf_nbytes + BUFFER_PADDING_SIZE);
+ if (!tmp) {
+ ret = AVERROR(ENOMEM);
+ goto fail;
+ }
+ vidbuf_start = tmp;
code = avio_r8(pb);
vidbuf_start[vidbuf_nbytes++] = code;
}
}
-AVInputFormat ff_bethsoftvid_demuxer = {
+const AVInputFormat ff_bethsoftvid_demuxer = {
.name = "bethsoftvid",
.long_name = NULL_IF_CONFIG_SMALL("Bethesda Softworks VID"),
.priv_data_size = sizeof(BVID_DemuxContext),