diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-13 01:10:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-13 01:10:13 +0200 |
| commit | 20a66868a25bf7719e73ba7c6bbbe59a0f7f77b7 (patch) | |
| tree | 921f790635d6f0e92a209dad1a016eeef072b7c5 /libavdevice/pulse_audio_common.c | |
| parent | ca5a77191b79e8ff46402e2db6f1bf18d034f9e8 (diff) | |
| parent | dad12ce452a9d69c0d9d53c375003947d5f1b02e (diff) | |
| download | ffmpeg-20a66868a25bf7719e73ba7c6bbbe59a0f7f77b7.tar.gz | |
Merge commit 'dad12ce452a9d69c0d9d53c375003947d5f1b02e'
* commit 'dad12ce452a9d69c0d9d53c375003947d5f1b02e':
movenc: Print a warning for an unhandled case of nonzero start dts with empty_moov
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/pulse_audio_common.c')
0 files changed, 0 insertions, 0 deletions