git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8a403b0
dab2034
)
Merge commit 'dab2034b8679aaacd8aef832cdeb71d0ee8a3358'
author
Clément Bœsch
<u@pkh.me>
Sun, 19 Mar 2017 14:49:15 +0000
(15:49 +0100)
committer
Clément Bœsch
<u@pkh.me>
Sun, 19 Mar 2017 14:49:15 +0000
(15:49 +0100)
* commit '
dab2034b8679aaacd8aef832cdeb71d0ee8a3358
':
roqvideoenc: Drop broken disabled cruft
Merged-by: Clément Bœsch <u@pkh.me>
1
2
libavcodec/roqvideoenc.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
libavcodec/roqvideoenc.c
Simple merge