[FFmpeg-cvslog] Merge commit '85baef4ff1512bcc2544928bfa5f42072903a691'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Wed Mar 29 14:26:21 2017 +0200| [ca6f0f85bb783833f36db94fd912b96a0ef3899a] | committer: Clément Bœsch

Merge commit '85baef4ff1512bcc2544928bfa5f42072903a691'

* 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 at pkh.me>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ca6f0f85bb783833f36db94fd912b96a0ef3899a
---

 libavfilter/vf_drawtext.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c
index bcbe2d9..8b24f50 100644
--- a/libavfilter/vf_drawtext.c
+++ b/libavfilter/vf_drawtext.c
@@ -269,8 +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 const struct ft_error {
     int err;
     const char *err_msg;
 } ft_errors[] =


======================================================================

diff --cc libavfilter/vf_drawtext.c
index bcbe2d9,994eea3..8b24f50
--- a/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[] =