aboutsummaryrefslogtreecommitdiffstats
path: root/ffplay.c
diff options
context:
space:
mode:
authorGanesh Ajjanagadde <gajjanagadde@gmail.com>2015-10-04 20:38:24 -0400
committerMarton Balint <cus@passwd.hu>2015-10-05 22:28:17 +0200
commit4c2bfabc3a82f976aa6f63d572a0040701bae7c2 (patch)
tree0218bb15f258a576ab3c68ab9a2e3f08d748df08 /ffplay.c
parentb67c1ab58cb1a9933d01ad91c2c58d019e215c3d (diff)
downloadandroid_external_ffmpeg-4c2bfabc3a82f976aa6f63d572a0040701bae7c2.tar.gz
android_external_ffmpeg-4c2bfabc3a82f976aa6f63d572a0040701bae7c2.tar.bz2
android_external_ffmpeg-4c2bfabc3a82f976aa6f63d572a0040701bae7c2.zip
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 <gajjanagadde@gmail.com> Signed-off-by: Marton Balint <cus@passwd.hu>
Diffstat (limited to 'ffplay.c')
-rw-r--r--ffplay.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ffplay.c b/ffplay.c
index cf0640ee9e..79f430de5e 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;