git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
17e47ec
6c82c87
)
Merge remote-tracking branch 'qatar/master'
author
Michael Niedermayer
<michaelni@gmx.at>
Mon, 28 Oct 2013 13:30:31 +0000
(14:30 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Mon, 28 Oct 2013 13:37:53 +0000
(14:37 +0100)
* qatar/master:
ac3dec: fix outptr increment.
Conflicts:
libavcodec/ac3dec.c
No change as this has been fixed in ffmpeg head already
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge