[FFmpeg-cvslog] avformat/adtsenc: do not pass NULL to av_log()

Paul B Mahol git at videolan.org
Thu Apr 27 23:55:31 EEST 2023


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Thu Apr 27 10:35:33 2023 +0200| [44c8f7df03617ce524f01e1a46b4d845527843bd] | committer: Paul B Mahol

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=44c8f7df03617ce524f01e1a46b4d845527843bd
---

 libavformat/adtsenc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavformat/adtsenc.c b/libavformat/adtsenc.c
index b5e9640544..c5765cc92e 100644
--- a/libavformat/adtsenc.c
+++ b/libavformat/adtsenc.c
@@ -127,14 +127,14 @@ static int adts_write_header(AVFormatContext *s)
     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)
 {
     PutBitContext pb;
 
     unsigned full_frame_size = (unsigned)ADTS_HEADER_SIZE + size + pce_size;
     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);
         return AVERROR_INVALIDDATA;
     }
@@ -192,7 +192,7 @@ static int adts_write_packet(AVFormatContext *s, AVPacket *pkt)
         }
     }
     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);
         if (err < 0)
             return err;



More information about the ffmpeg-cvslog mailing list