diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-30 10:03:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-30 10:03:02 +0200 |
| commit | 5a270296cb014de3bf8d12aece0bdd7cecad5318 (patch) | |
| tree | 1ca325405258c53f6d2b3de88829ee95f1d0970a /libavformat/wtv.c | |
| parent | 947f2d4d34f29a8bc51fd4a97718b1c163d7a55d (diff) | |
| parent | e1d5b244761cf69db655ad7ece1dbf2c13dd4fce (diff) | |
| download | ffmpeg-5a270296cb014de3bf8d12aece0bdd7cecad5318.tar.gz | |
Merge commit 'e1d5b244761cf69db655ad7ece1dbf2c13dd4fce'
* commit 'e1d5b244761cf69db655ad7ece1dbf2c13dd4fce':
hls: Store first_timestamp in units of AV_TIME_BASE
Conflicts:
libavformat/hls.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/wtv.c')
0 files changed, 0 insertions, 0 deletions