diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-12 14:38:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-12 14:38:04 +0200 |
| commit | d6135a886d85bdbf271c55a238c3336670adc742 (patch) | |
| tree | 247f875999dfd6b314fbe68ebaf843a2e0f5338e /libavutil | |
| parent | e335658370840390272b70de92f5a76860537fb9 (diff) | |
| parent | 15ba7f6525c0f56f0c8e3e3e0c0c5129de054f41 (diff) | |
| download | ffmpeg-d6135a886d85bdbf271c55a238c3336670adc742.tar.gz | |
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>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/parseutils.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavutil/parseutils.c b/libavutil/parseutils.c index b467d0561b..54231c0b9c 100644 --- 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); |