virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

lavf/mxfenc: Return AVERROR(EINVAL) in mxf_write_jpeg2000_subdesc() is pixfmt not set

Browse Source
This commit is contained in:
Tomas Härdin
2024-11-08 11:26:24 +01:00
parent 0202c7cc2e
commit 9729444c7d
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/mxfenc.c
View File

@ -1483,7 +1483,7 @@ static void mxf_write_avc_subdesc(AVFormatContext *s, AVStream *st)
mxf_update_klv_size(s->pb, pos); mxf_update_klv_size(s->pb, pos);
} }
static void mxf_write_jpeg2000_subdesc(AVFormatContext *s, AVStream *st) static int mxf_write_jpeg2000_subdesc(AVFormatContext *s, AVStream *st)
{ {
MXFStreamContext *sc = st->priv_data; MXFStreamContext *sc = st->priv_data;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
@ -1492,7 +1492,7 @@ static void mxf_write_jpeg2000_subdesc(AVFormatContext *s, AVStream *st)
if (!pix_desc) { if (!pix_desc) {
av_log(s, AV_LOG_ERROR, "Pixel format not set - not writing JPEG2000SubDescriptor\n"); av_log(s, AV_LOG_ERROR, "Pixel format not set - not writing JPEG2000SubDescriptor\n");
return; return AVERROR(EINVAL);
} }
/* JPEG2000 subdescriptor key */ /* JPEG2000 subdescriptor key */
@ -1543,6 +1543,7 @@ static void mxf_write_jpeg2000_subdesc(AVFormatContext *s, AVStream *st)
avio_write(pb, sc->j2k_info.j2k_comp_desc, 3*pix_desc->nb_components); avio_write(pb, sc->j2k_info.j2k_comp_desc, 3*pix_desc->nb_components);
mxf_update_klv_size(pb, pos); mxf_update_klv_size(pb, pos);
return 0;
} }
static int mxf_write_cdci_desc(AVFormatContext *s, AVStream *st) static int mxf_write_cdci_desc(AVFormatContext *s, AVStream *st)
@ -1554,7 +1555,7 @@ static int mxf_write_cdci_desc(AVFormatContext *s, AVStream *st)
mxf_write_avc_subdesc(s, st); mxf_write_avc_subdesc(s, st);
} }
if (st->codecpar->codec_id == AV_CODEC_ID_JPEG2000) { if (st->codecpar->codec_id == AV_CODEC_ID_JPEG2000) {
mxf_write_jpeg2000_subdesc(s, st); return mxf_write_jpeg2000_subdesc(s, st);
} }
return 0; return 0;
} }