Merge commit '67351924fa91dea4339109100a4c0689f006581f'

* commit '67351924fa91dea4339109100a4c0689f006581f': Drop unreachable break and return statements Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-30 10:26:29 +02:00
parent f291a9a1ad 67351924fa
commit 03f5e80bdb
7 changed files with 0 additions and 10 deletions
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
@@ -311,8 +311,6 @@ static int set_string_number(void *obj, void *target_obj, const AVOption *o, con
        if (!i || !*val)
            return 0;
    }
-
-    return 0;
 }

 static int set_string_image_size(void *obj, const AVOption *o, const char *val, int *dst)