diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-25 15:04:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-25 15:04:41 +0100 |
| commit | fc2922836bc289e443c0c7a20450bf8f03c0785d (patch) | |
| tree | 20843987f14580004c6f67314783eb39d00e2e93 /libavdevice/libdc1394.c | |
| parent | 25be63005f0ba0b4cb8bf2569202ad0e89b4dae3 (diff) | |
| parent | 0b55b16abc15c3fad0ae8b7cedc8f63f1162e89c (diff) | |
| download | ffmpeg-fc2922836bc289e443c0c7a20450bf8f03c0785d.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avfilter: allow setpts filter to use wallclock time for calculations
Conflicts:
doc/filters.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/libdc1394.c')
0 files changed, 0 insertions, 0 deletions