har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/adtsenc: do not pass NULL to av_log()

Browse Source
This commit is contained in:
Paul B Mahol 2023-04-27 10:35:33 +02:00
parent 97befd7fcb
commit 44c8f7df03
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/adtsenc.c
View File

@ -127,14 +127,14 @@ static int adts_write_header(AVFormatContext *s)
return 0; return 0;
} }
static int adts_write_frame_header(ADTSContext *ctx, static int adts_write_frame_header(AVFormatContext *s, ADTSContext *ctx,
uint8_t *buf, int size, int pce_size) uint8_t *buf, int size, int pce_size)
{ {
PutBitContext pb; PutBitContext pb;
unsigned full_frame_size = (unsigned)ADTS_HEADER_SIZE + size + pce_size; unsigned full_frame_size = (unsigned)ADTS_HEADER_SIZE + size + pce_size;
if (full_frame_size > ADTS_MAX_FRAME_BYTES) { if (full_frame_size > ADTS_MAX_FRAME_BYTES) {
av_log(NULL, AV_LOG_ERROR, "ADTS frame size too large: %u (max %d)\n", av_log(s, AV_LOG_ERROR, "frame size too large: %u (max %d)\n",
full_frame_size, ADTS_MAX_FRAME_BYTES); full_frame_size, ADTS_MAX_FRAME_BYTES);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
@ -192,7 +192,7 @@ static int adts_write_packet(AVFormatContext *s, AVPacket *pkt)
} }
} }
if (adts->write_adts) { if (adts->write_adts) {
int err = adts_write_frame_header(adts, buf, pkt->size, int err = adts_write_frame_header(s, adts, buf, pkt->size,
adts->pce_size); adts->pce_size);
if (err < 0) if (err < 0)
return err; return err;