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:
84ecbbf
75872d7
)
Merge commit '75872d77d215d64b8d9430df23c6c74ff921227b'
author
Clément Bœsch
<u@pkh.me>
Sat, 9 Jul 2016 12:55:39 +0000
(14:55 +0200)
committer
Clément Bœsch
<u@pkh.me>
Sat, 9 Jul 2016 12:55:39 +0000
(14:55 +0200)
* commit '
75872d77d215d64b8d9430df23c6c74ff921227b
':
lavc: Document AV_PKT_DATA_NEW_EXTRADATA
Merged-by: Clément Bœsch <u@pkh.me>
1
2
libavcodec/avcodec.h
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
libavcodec/avcodec.h
Simple merge