projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
63c41c5
85baef4
)
Merge commit '85baef4ff1512bcc2544928bfa5f42072903a691'
author
Clément Bœsch
<u@pkh.me>
Wed, 29 Mar 2017 12:26:21 +0000
(14:26 +0200)
committer
Clément Bœsch
<u@pkh.me>
Wed, 29 Mar 2017 12:26:57 +0000
(14:26 +0200)
* commit '
85baef4ff1512bcc2544928bfa5f42072903a691
':
vf_drawtext: Move static keyword to beginning of variable declaration
This commit is mostly a noop, see:
d9e2aceb7f1c712a52672129ca7971872b030e1e
6d7aa437e1108dd8142ae5b850a00c109f95f07f
Merged-by: Clément Bœsch <u@pkh.me>
1
2
libavfilter/vf_drawtext.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
libavfilter/vf_drawtext.c
index
bcbe2d9
,
994eea3
..
8b24f50
---
1
/
libavfilter/vf_drawtext.c
---
2
/
libavfilter/vf_drawtext.c
+++ b/
libavfilter/vf_drawtext.c
@@@
-269,8
-219,7
+269,7
@@@
AVFILTER_DEFINE_CLASS(drawtext)
#define FT_ERRORDEF(e, v, s) { (e), (s) },
#define FT_ERROR_END_LIST { 0, NULL } };
- static const struct ft_error
- {
-static struct ft_error {
++static const struct ft_error {
int err;
const char *err_msg;
} ft_errors[] =