diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-12 14:14:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-12 14:14:54 +0200 |
| commit | 8de021fabe3a1c7a1465d5fa6e238803a3d82f04 (patch) | |
| tree | c7233f8306d57a766d9e609c26963f3e712c01e1 /libavfilter/framesync.c | |
| parent | 23c8a3353bd948f4a69116124dc433c85909d86e (diff) | |
| parent | 3a92ee59531611e1daa8f25b7b673c920781290f (diff) | |
| download | ffmpeg-8de021fabe3a1c7a1465d5fa6e238803a3d82f04.tar.gz | |
Merge remote-tracking branch 'lukaszmluki/master'
* lukaszmluki/master:
avformat/ftp: add log regarding passive mode failure
avformat/ftp: fix possible deadlock
avdevice/pulse_audio_enc: fix stream index
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/framesync.c')
0 files changed, 0 insertions, 0 deletions