Merge commit '15ba7f6525c0f56f0c8e3e3e0c0c5129de054f41'

* commit '15ba7f6525c0f56f0c8e3e3e0c0c5129de054f41': parseutils: fix const removal warning prepare 9_beta1 release Conflicts: Changelog RELEASE libavutil/parseutils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago · d6135a886d
parent e335658370 15ba7f6525
commit d6135a886d
1 changed files with 1 additions and 2 deletions
--- a/libavutil/parseutils.c
+++ b/libavutil/parseutils.c
@ -144,8 +144,7 @@ int av_parse_video_size(int *width_ptr, int *height_ptr, const char *str)
        }
    }
    if (i == n) {
-        p = str;
-        width = strtol(p, (void*)&p, 10);
+        width = strtol(str, (void*)&p, 10);
        if (*p)
            p++;
        height = strtol(p, (void*)&p, 10);