ffmpeg | branch: master | Ganesh Ajjanagadde <gajjanaga...@gmail.com> | Sun Oct 4 20:38:24 2015 -0400| [4c2bfabc3a82f976aa6f63d572a0040701bae7c2] | committer: Marton Balint
ffplay: use correct context for av_log Recent commits c3e8de1c248f8c742dd9e61a0c71ee56bba22c28 and 8dc6e92c3dc67a85026f3010045c7a28b1c0adc8 used av_log incorrectly. This fixes such usage. Signed-off-by: Ganesh Ajjanagadde <gajjanaga...@gmail.com> Signed-off-by: Marton Balint <c...@passwd.hu> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4c2bfabc3a82f976aa6f63d572a0040701bae7c2 --- ffplay.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ffplay.c b/ffplay.c index cf0640e..79f430d 100644 --- a/ffplay.c +++ b/ffplay.c @@ -456,12 +456,12 @@ static int packet_queue_init(PacketQueue *q) memset(q, 0, sizeof(PacketQueue)); q->mutex = SDL_CreateMutex(); if (!q->mutex) { - av_log(q, AV_LOG_FATAL, "SDL_CreateMutex(): %s\n", SDL_GetError()); + av_log(NULL, AV_LOG_FATAL, "SDL_CreateMutex(): %s\n", SDL_GetError()); return AVERROR(ENOMEM); } q->cond = SDL_CreateCond(); if (!q->cond) { - av_log(q, AV_LOG_FATAL, "SDL_CreateCond(): %s\n", SDL_GetError()); + av_log(NULL, AV_LOG_FATAL, "SDL_CreateCond(): %s\n", SDL_GetError()); return AVERROR(ENOMEM); } q->abort_request = 1; @@ -2089,7 +2089,7 @@ static int decoder_start(Decoder *d, int (*fn)(void *), void *arg) packet_queue_start(d->queue); d->decoder_tid = SDL_CreateThread(fn, arg); if (!d->decoder_tid) { - av_log(d, AV_LOG_ERROR, "SDL_CreateThread(): %s\n", SDL_GetError()); + av_log(NULL, AV_LOG_ERROR, "SDL_CreateThread(): %s\n", SDL_GetError()); return AVERROR(ENOMEM); } return 0; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
