OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
50c0837
9d86bfc
)
Merge commit '9d86bfc259ae9ba7a76067ec931ff20fbb86ea2a'
author
Michael Niedermayer
<michaelni@gmx.at>
Fri, 16 Aug 2013 12:04:57 +0000
(14:04 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Fri, 16 Aug 2013 12:05:59 +0000
(14:05 +0200)
* commit '
9d86bfc259ae9ba7a76067ec931ff20fbb86ea2a
':
hlsenc: Don't reset the number variable when wrapping
Conflicts:
libavformat/hlsenc.c
See:
75b9fb27f516f9db7995ab2c2abb83e25cae5813
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge