Commit 8adf9bb2 authored by Stefano Sabatini's avatar Stefano Sabatini

ffplay: rename decode_thread to read_thread, parse_tid to read_tid

The new names are less misleading and more reciprocally consistent.
parent 31d8467d
...@@ -126,7 +126,7 @@ enum { ...@@ -126,7 +126,7 @@ enum {
}; };
typedef struct VideoState { typedef struct VideoState {
SDL_Thread *parse_tid; SDL_Thread *read_tid;
SDL_Thread *video_tid; SDL_Thread *video_tid;
SDL_Thread *refresh_tid; SDL_Thread *refresh_tid;
AVInputFormat *iformat; AVInputFormat *iformat;
...@@ -1270,7 +1270,7 @@ static void stream_close(VideoState *is) ...@@ -1270,7 +1270,7 @@ static void stream_close(VideoState *is)
int i; int i;
/* XXX: use a special url_shutdown call to abort parse cleanly */ /* XXX: use a special url_shutdown call to abort parse cleanly */
is->abort_request = 1; is->abort_request = 1;
SDL_WaitThread(is->parse_tid, NULL); SDL_WaitThread(is->read_tid, NULL);
SDL_WaitThread(is->refresh_tid, NULL); SDL_WaitThread(is->refresh_tid, NULL);
/* free all pictures */ /* free all pictures */
...@@ -2366,7 +2366,7 @@ static int decode_interrupt_cb(void) ...@@ -2366,7 +2366,7 @@ static int decode_interrupt_cb(void)
} }
/* this thread gets the stream from the disk or the network */ /* this thread gets the stream from the disk or the network */
static int decode_thread(void *arg) static int read_thread(void *arg)
{ {
VideoState *is = arg; VideoState *is = arg;
AVFormatContext *ic; AVFormatContext *ic;
...@@ -2637,8 +2637,8 @@ static VideoState *stream_open(const char *filename, AVInputFormat *iformat) ...@@ -2637,8 +2637,8 @@ static VideoState *stream_open(const char *filename, AVInputFormat *iformat)
is->subpq_cond = SDL_CreateCond(); is->subpq_cond = SDL_CreateCond();
is->av_sync_type = av_sync_type; is->av_sync_type = av_sync_type;
is->parse_tid = SDL_CreateThread(decode_thread, is); is->read_tid = SDL_CreateThread(read_thread, is);
if (!is->parse_tid) { if (!is->read_tid) {
av_free(is); av_free(is);
return NULL; return NULL;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment