[FFmpeg-cvslog] Merge commit 'eef9f06508354d1c7d5624c1c18997e7974288f1'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Tue Feb 16 16:49:19 2016 +0000| [32766877b4e1a7eeacfbca50c55d55ce8bb7b73d] | committer: Derek Buitenhuis

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 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=32766877b4e1a7eeacfbca50c55d55ce8bb7b73d
---