diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-30 14:11:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-30 14:11:17 +0100 |
| commit | 56c71cd599862e02c4b579efe8eace376933efd4 (patch) | |
| tree | e15d5644c509d47b953c545d7fff2d57cf0729e8 /COPYING.LGPLv2.1 | |
| parent | 19e1c8e4f203a9445aadfc683449968a59f9aa81 (diff) | |
| parent | 9b1370aced385698bc783747917544ab69ecb373 (diff) | |
| download | ffmpeg-56c71cd599862e02c4b579efe8eace376933efd4.tar.gz | |
Merge commit '9b1370aced385698bc783747917544ab69ecb373'
* commit '9b1370aced385698bc783747917544ab69ecb373':
hlsenc: do not add timestamps in different timebases
hlsenc: use the correct AV_TIME_BASE macro
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'COPYING.LGPLv2.1')
0 files changed, 0 insertions, 0 deletions