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:
fa3a7b5
e760e1d
)
Merge remote-tracking branch 'qatar/master'
author
Michael Niedermayer
<michaelni@gmx.at>
Wed, 6 Mar 2013 23:27:53 +0000
(
00:27
+0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Wed, 6 Mar 2013 23:28:15 +0000
(
00:28
+0100)
* qatar/master:
avconv: Make sure the encoder exists before inspecting supported_list
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1
2
ffmpeg_filter.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
ffmpeg_filter.c
Simple merge