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:
6c9b82b
b452d5a
)
Merge commit 'b452d5ae866942cec00aa1432fe29498b38b49fc'
author
Michael Niedermayer
<michaelni@gmx.at>
Sat, 30 Nov 2013 01:25:51 +0000
(
02:25
+0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sat, 30 Nov 2013 01:27:41 +0000
(
02:27
+0100)
* commit '
b452d5ae866942cec00aa1432fe29498b38b49fc
':
mpeg4videodec: move mpeg4-specific bug detection from h263 generic code to mpeg4
Conflicts:
libavcodec/h263dec.c
not merged, the header decode function is not the right place
See:
6c9b82b6a0d5cbdf90dcbf9f4e1c77ae82c5698f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge