diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-30 10:12:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-30 10:12:48 +0200 |
| commit | 4971551fd215b8c7e9f3e20fc1536bb2150c84b4 (patch) | |
| tree | 2fc390807584b7460a0842f35a211567095136ad /libavformat/os_support.c | |
| parent | 5a270296cb014de3bf8d12aece0bdd7cecad5318 (diff) | |
| parent | c44191039944526dd7eb6e536990b555837961f5 (diff) | |
| download | ffmpeg-4971551fd215b8c7e9f3e20fc1536bb2150c84b4.tar.gz | |
Merge commit 'c44191039944526dd7eb6e536990b555837961f5'
* commit 'c44191039944526dd7eb6e536990b555837961f5':
hls: Store all durations in AV_TIME_BASE
Conflicts:
libavformat/hls.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/os_support.c')
0 files changed, 0 insertions, 0 deletions