diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-01 14:59:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-01 14:59:08 +0200 |
| commit | c3f20cef06101adabffab98d81c6002d9202ef63 (patch) | |
| tree | dee2b0e15e95e43860799291e236c182e44c3bbc /libavformat/rtmppkt.c | |
| parent | 75a4b91f8354fbae24a38b94b26ddac6a114014e (diff) | |
| parent | 55594447d635a89d6b0183299f2bf8e27e8a0d42 (diff) | |
| download | ffmpeg-c3f20cef06101adabffab98d81c6002d9202ef63.tar.gz | |
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: only free vfilters on exit
ffplay: replace SDL_delay in read thread with SDL_CondWait
ffplay: requeue last picture on forced video refresh
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtmppkt.c')
0 files changed, 0 insertions, 0 deletions