projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
037af63
9a27aca
)
Merge remote-tracking branch 'qatar/master'
author
Michael Niedermayer
<michaelni@gmx.at>
Mon, 19 Aug 2013 09:11:14 +0000
(11:11 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Mon, 19 Aug 2013 09:22:26 +0000
(11:22 +0200)
* qatar/master:
ogg: Fix potential infinite discard loop
No change as this commit has been part of ffmpeg since a while already
See:
d7b542ae294aaf818f2a00c5606e009cf931e77c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge