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:
4a0d827
e1eaaec
)
Merge commit 'e1eaaec765d2e726618633fcbd2e06fded7647a8'
author
Michael Niedermayer
<michaelni@gmx.at>
Fri, 6 Dec 2013 09:06:43 +0000
(10:06 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Fri, 6 Dec 2013 09:06:43 +0000
(10:06 +0100)
* commit '
e1eaaec765d2e726618633fcbd2e06fded7647a8
':
mjpegenc: remove commented out never-to-be-finished WIP cruft
Conflicts:
libavcodec/mjpegenc.c
The unfinished 2-matrix code is left in place and not removed
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge