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:
e20f2dc
cb6f824
)
Merge commit 'cb6f8245aed2c26fe95c30cd68c45983277a945a'
author
Michael Niedermayer
<michaelni@gmx.at>
Fri, 1 Mar 2013 11:47:53 +0000
(12:47 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Fri, 1 Mar 2013 11:48:55 +0000
(12:48 +0100)
* commit '
cb6f8245aed2c26fe95c30cd68c45983277a945a
':
cmdutils: Allow calling filter_codec_opts without a set encoder
pnm: Use av_pix_fmt_desc_get instead of accessing the array directly
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1
2
cmdutils.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
cmdutils.c
Simple merge