diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-03 12:58:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-03 12:58:54 +0100 |
| commit | b568eeba75249813ea844e65bd57665a0dee9e55 (patch) | |
| tree | 2ce39245cade18be4d906a4f22c54624b83abc02 | |
| parent | b6413cdc02f3ec9434fb6ab739e699b99b2154f6 (diff) | |
| parent | 3ea5f64ffff0a51f62922efd2e2bc231b13b2179 (diff) | |
| download | ffmpeg-b568eeba75249813ea844e65bd57665a0dee9e55.tar.gz | |
Merge commit '3ea5f64ffff0a51f62922efd2e2bc231b13b2179'
* commit '3ea5f64ffff0a51f62922efd2e2bc231b13b2179':
ansi: fix possible use of uninitialized variables
Conflicts:
libavcodec/ansi.c
Only partially merged, ffmpeg is not affected by this.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/ansi.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/ansi.c b/libavcodec/ansi.c index 16dda307dd..69f0c29ec1 100644 --- a/libavcodec/ansi.c +++ b/libavcodec/ansi.c @@ -182,7 +182,10 @@ static void draw_char(AVCodecContext *avctx, int c) static int execute_code(AVCodecContext * avctx, int c) { AnsiContext *s = avctx->priv_data; - int ret, i, width, height; + int ret, i; + int width = 0; + int height = 0; + switch(c) { case 'A': //Cursor Up s->y = FFMAX(s->y - (s->nb_args > 0 ? s->args[0]*s->font_height : s->font_height), 0); |