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:
b24e8f5
68e57cd
)
Merge commit '68e57cde68f3da4c557ca15491fda74d1ea6321e'
author
Michael Niedermayer
<michaelni@gmx.at>
Sun, 14 Jul 2013 10:05:08 +0000
(12:05 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sun, 14 Jul 2013 10:08:38 +0000
(12:08 +0200)
* commit '
68e57cde68f3da4c557ca15491fda74d1ea6321e
':
ac3dec: Increment channel pointers only once per channel
Conflicts:
libavcodec/ac3dec.c
See:
7aabeea9ba0e557e834c886de5ea4db8e9a5193d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge