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:
8d86e7b
fffca3d
)
Merge commit 'fffca3d278c2a2422c2f61f21c5a9d5f690d328e'
author
Michael Niedermayer
<michaelni@gmx.at>
Mon, 6 Jan 2014 12:30:40 +0000
(13:30 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Mon, 6 Jan 2014 12:31:59 +0000
(13:31 +0100)
* commit '
fffca3d278c2a2422c2f61f21c5a9d5f690d328e
':
4xm: return a proper error code.
Conflicts:
libavcodec/4xm.c
See:
a5e382ad7ffd8be810f3a614c4c447a1cd1936f2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge