diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-09 04:49:56 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-09 04:50:00 +0200 |
| commit | 93e8fcb94b1ae3e1cb9be1164bb098b3ed188a11 (patch) | |
| tree | bbe95ae14387eeb4322601ed7fb9410c8c0e087a /libavformat/srtp.c | |
| parent | 5fbf9c12aa0ddafa4b89dac70a02251d32814d0d (diff) | |
| parent | 85b9bf5693c821bcfec89ea0964f52a7eeff233f (diff) | |
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: simplify video pts calculation
ffplay: fix indentation
ffplay: handle audio buffersink output properly with buffering filters
ffplay: set time_base of audio filter buffer src
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/srtp.c')
0 files changed, 0 insertions, 0 deletions