RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ffplay: use correct context for av_log 

Recent commits c3e8de1c24 and
8dc6e92c3d used av_log incorrectly.
This fixes such usage.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Ganesh Ajjanagadde 2015-10-04 20:38:24 -04:00 committed by Marton Balint
parent b67c1ab58c
commit 4c2bfabc3a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ffplay.c
View File

@ -456,12 +456,12 @@ static int packet_queue_init(PacketQueue *q)
memset(q, 0, sizeof(PacketQueue)); memset(q, 0, sizeof(PacketQueue));
q->mutex = SDL_CreateMutex(); q->mutex = SDL_CreateMutex();
if (!q->mutex) { 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); return AVERROR(ENOMEM);
} }
q->cond = SDL_CreateCond(); q->cond = SDL_CreateCond();
if (!q->cond) { 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); return AVERROR(ENOMEM);
} }
q->abort_request = 1; q->abort_request = 1;
@ -2089,7 +2089,7 @@ static int decoder_start(Decoder *d, int (*fn)(void *), void *arg)
packet_queue_start(d->queue); packet_queue_start(d->queue);
d->decoder_tid = SDL_CreateThread(fn, arg); d->decoder_tid = SDL_CreateThread(fn, arg);
if (!d->decoder_tid) { 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 AVERROR(ENOMEM);
} }
return 0; return 0;