diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-26 12:30:59 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-26 12:31:04 +0400 |
| commit | 0feecb62abab9ec6afa98121a07941792204fad9 (patch) | |
| tree | 9eea12d5e3f46b355bb98f596fac14dbc3f8aade /ffplay.c | |
| parent | 7e19c549bafa9e4025d0adc59593f6541ccbe304 (diff) | |
| parent | c4281705492a1c862a0faff6c3132fbdeb60d35a (diff) | |
Merge remote-tracking branch 'lukaszmluki/master'
* lukaszmluki/master:
lavd/pulse_audio_enc: avoid vars in for()
lavd/pulse_audio_enc: add another default to stream name
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffplay.c')
0 files changed, 0 insertions, 0 deletions