Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@outlook.com>
---
libavformat/dvdvideodec.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/libavformat/dvdvideodec.c b/libavformat/dvdvideodec.c
index f2f23affb2..7f4ecf2b61 100644
--- a/libavformat/dvdvideodec.c
+++ b/libavformat/dvdvideodec.c
@@ -1211,20 +1211,16 @@ static int dvdvideo_subdemux_open(AVFormatContext *s)
extern const AVInputFormat ff_mpegps_demuxer;
int ret = 0;
- if (!(c->mpeg_ctx = avformat_alloc_context()))
- return AVERROR(ENOMEM);
-
- if (!(c->mpeg_buf = av_mallocz(DVDVIDEO_BLOCK_SIZE))) {
- avformat_free_context(c->mpeg_ctx);
- c->mpeg_ctx = NULL;
-
+ if (!(c->mpeg_buf = av_mallocz(DVDVIDEO_BLOCK_SIZE)))
return AVERROR(ENOMEM);
- }
ffio_init_context(&c->mpeg_pb, c->mpeg_buf, DVDVIDEO_BLOCK_SIZE, 0, s,
dvdvideo_subdemux_read_data, NULL, NULL);
c->mpeg_pb.pub.seekable = 0;
+ if (!(c->mpeg_ctx = avformat_alloc_context()))
+ return AVERROR(ENOMEM);
+
if ((ret = ff_copy_whiteblacklists(c->mpeg_ctx, s)) < 0) {
avformat_free_context(c->mpeg_ctx);
c->mpeg_ctx = NULL;
--
2.40.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
