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:
3cfe1d9
4843a9c
)
Merge commit '4843a9c74f77f5eb8d2b1ee648fe2ac6e2a48ec3'
author
Michael Niedermayer
<michaelni@gmx.at>
Mon, 8 Dec 2014 19:53:19 +0000
(20:53 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Mon, 8 Dec 2014 19:53:19 +0000
(20:53 +0100)
* commit '
4843a9c74f77f5eb8d2b1ee648fe2ac6e2a48ec3
':
dpx: always write the image offset
Conflicts:
libavcodec/dpxenc.c
tests/ref/lavf/dpx
See:
361319d0f49475bc14c744194870f9bab78a8a83
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge