diff options
| author | Michael Niedermayer <[email protected]> | 2014-03-01 13:47:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-03-01 13:47:08 +0100 |
| commit | 0bb474f686fb33ef731e34972e48b82dfbf82984 (patch) | |
| tree | 865588040d395f648e3c01c5f173fac2e3240680 /libavformat/hlsenc.c | |
| parent | eea2cd23e91ab930631d66e8ade401ece705802e (diff) | |
| parent | ea15a9a5d8fa6a71af3101b2af18c4dcac07987f (diff) | |
Merge commit 'ea15a9a5d8fa6a71af3101b2af18c4dcac07987f'
* commit 'ea15a9a5d8fa6a71af3101b2af18c4dcac07987f':
qt-faststart: Simplify code by using a MIN() macro
Conflicts:
tools/qt-faststart.c
See: 59003fe7c064e98359cce83b1b727fb1026bdf12
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavformat/hlsenc.c')
0 files changed, 0 insertions, 0 deletions