diff options
author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-16 16:49:19 +0000 |
---|---|---|
committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-16 16:49:19 +0000 |
commit | 32766877b4e1a7eeacfbca50c55d55ce8bb7b73d (patch) | |
tree | 3109a5cc04e7b973b8da67fb1eb27d81e99dda50 /libavformat/sapenc.c | |
parent | d0fc5de3a643fe7f974ed14e410c2ac2f4147d7e (diff) | |
parent | eef9f06508354d1c7d5624c1c18997e7974288f1 (diff) | |
download | ffmpeg-32766877b4e1a7eeacfbca50c55d55ce8bb7b73d.tar.gz |
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>
Diffstat (limited to 'libavformat/sapenc.c')
0 files changed, 0 insertions, 0 deletions