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:
df5e089
79922d7
)
Merge commit '79922d7237aba2b8c6abbd2e06a0c08e4f498ad4'
author
Michael Niedermayer
<michaelni@gmx.at>
Wed, 17 Oct 2012 13:50:45 +0000
(15:50 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Wed, 17 Oct 2012 13:52:04 +0000
(15:52 +0200)
* commit '
79922d7237aba2b8c6abbd2e06a0c08e4f498ad4
':
wav: do not fail on empty INFO tags
Conflicts:
libavformat/wavdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge