virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

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

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-02-29 20:01:33 +01:00
parent 00d0934fce
commit 0b1af9d330
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/webm_chunk.c
View File

@ -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);
}
}