Merge commit 'eef9f06508354d1c7d5624c1c18997e7974288f1'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 16 Feb 2016 16:49:19 +0000 (16:49 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 16 Feb 2016 16:49:19 +0000 (16:49 +0000)
commit32766877b4e1a7eeacfbca50c55d55ce8bb7b73d
tree3109a5cc04e7b973b8da67fb1eb27d81e99dda50
parentd0fc5de3a643fe7f974ed14e410c2ac2f4147d7e
parenteef9f06508354d1c7d5624c1c18997e7974288f1
Merge commit 'eef9f06508354d1c7d5624c1c18997e7974288f1'

This commit is a no-nop.

* commit 'eef9f06508354d1c7d5624c1c18997e7974288f1':
  avplay: Allow to override the codec
  avplay: Statically allocate the player state
  avplay: Rename cur_stream to player
  avplay: Rename VideoState to PlayerState
  avplay: Allocate the refresh thread next to the decode thread
  avplay: Move the stream setup in the main thread

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>