diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2025-03-30 12:06:13 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2025-03-31 08:04:05 +0200 |
| commit | 35c091f4b7fb19aee9dfcc6c60ace0be92907ce5 (patch) | |
| tree | 463112c03a322b59e84e00ec6b23f51fc8cbb2ea /libavformat/rtpenc.c | |
| parent | 1d2c39100524e8528b1fd48b71924ddc6a2b011c (diff) | |
| download | ffmpeg-35c091f4b7fb19aee9dfcc6c60ace0be92907ce5.tar.gz | |
avformat/rtpenc: Check dimensions during init
Also fixes a -Wdeclaration-after-statement warning.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavformat/rtpenc.c')
| -rw-r--r-- | libavformat/rtpenc.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c index 8b989dca71..b220a941a2 100644 --- a/libavformat/rtpenc.c +++ b/libavformat/rtpenc.c @@ -219,6 +219,14 @@ static int rtp_write_header(AVFormatContext *s1) s->nal_length_size = (st->codecpar->extradata[21] & 0x03) + 1; } break; + case AV_CODEC_ID_MJPEG: + case AV_CODEC_ID_BITPACKED: + case AV_CODEC_ID_RAWVIDEO: + if (st->codecpar->width <= 0 || st->codecpar->height <= 0) { + av_log(s1, AV_LOG_ERROR, "dimensions not set\n"); + return AVERROR(EINVAL); + } + break; case AV_CODEC_ID_VP9: if (s1->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) { av_log(s, AV_LOG_ERROR, @@ -635,18 +643,10 @@ static int rtp_write_packet(AVFormatContext *s1, AVPacket *pkt) rtp_send_ilbc(s1, pkt->data, size); break; case AV_CODEC_ID_MJPEG: - if (st->codecpar->width <= 0 || st->codecpar->height <= 0) { - av_log(s1, AV_LOG_ERROR, "dimensions not set\n"); - return AVERROR(EINVAL); - } ff_rtp_send_jpeg(s1, pkt->data, size); break; case AV_CODEC_ID_BITPACKED: case AV_CODEC_ID_RAWVIDEO: { - if (st->codecpar->width <= 0 || st->codecpar->height <= 0) { - av_log(s1, AV_LOG_ERROR, "dimensions not set\n"); - return AVERROR(EINVAL); - } int interlaced = st->codecpar->field_order != AV_FIELD_PROGRESSIVE; ff_rtp_send_raw_rfc4175(s1, pkt->data, size, interlaced, 0); |