[FFmpeg-cvslog] avformat/webm_chunk: Don't use child AVFormatContext for logging

Andreas Rheinhardt git at videolan.org
Thu Mar 26 02:49:18 EET 2020


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Sat Feb 29 20:01:33 2020 +0100| [0b1af9d3306583af0ac8016f99017460c1d56aad] | committer: Andreas Rheinhardt

avformat/webm_chunk: Don't use child AVFormatContext for logging

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>

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

 libavformat/webm_chunk.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/libavformat/webm_chunk.c b/libavformat/webm_chunk.c
index 4e2ce21a79..d75fd5e6a3 100644
--- a/libavformat/webm_chunk.c
+++ b/libavformat/webm_chunk.c
@@ -87,25 +87,24 @@ static int chunk_mux_init(AVFormatContext *s)
 static int get_chunk_filename(AVFormatContext *s, int is_header, char filename[MAX_FILENAME_SIZE])
 {
     WebMChunkContext *wc = s->priv_data;
-    AVFormatContext *oc = wc->avf;
     if (!filename) {
         return AVERROR(EINVAL);
     }
     if (is_header) {
         int len;
         if (!wc->header_filename) {
-            av_log(oc, AV_LOG_ERROR, "No header filename provided\n");
+            av_log(s, AV_LOG_ERROR, "No header filename provided\n");
             return AVERROR(EINVAL);
         }
         len = av_strlcpy(filename, wc->header_filename, MAX_FILENAME_SIZE);
         if (len >= MAX_FILENAME_SIZE) {
-            av_log(oc, AV_LOG_ERROR, "Header filename too long\n");
+            av_log(s, AV_LOG_ERROR, "Header filename too long\n");
             return AVERROR(EINVAL);
         }
     } else {
         if (av_get_frame_filename(filename, MAX_FILENAME_SIZE,
                                   s->url, wc->chunk_index - 1) < 0) {
-            av_log(oc, AV_LOG_ERROR, "Invalid chunk filename template '%s'\n", s->url);
+            av_log(s, AV_LOG_ERROR, "Invalid chunk filename template '%s'\n", s->url);
             return AVERROR(EINVAL);
         }
     }



More information about the ffmpeg-cvslog mailing list