virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity

Merge commit '15ba7f6525c0f56f0c8e3e3e0c0c5129de054f41'

Browse Source 
* commit '15ba7f6525c0f56f0c8e3e3e0c0c5129de054f41':
  parseutils: fix const removal warning
  prepare 9_beta1 release

Conflicts:
	Changelog
	RELEASE
	libavutil/parseutils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-10-12 14:38:04 +02:00
commit d6135a886d
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavutil/parseutils.c
View File

@ -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);