Remove 'const' qualifier from variable in av_parse_video_frame_size().
Thus only one warning is printed due to assignment instead of 2 from strtol. Originally committed as revision 17045 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
8eb027c83c
commit
8468664bd8
1 changed files with 3 additions and 3 deletions
|
@ -1032,7 +1032,7 @@ int av_parse_video_frame_size(int *width_ptr, int *height_ptr, const char *str)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
int n = FF_ARRAY_ELEMS(video_frame_size_abbrs);
|
int n = FF_ARRAY_ELEMS(video_frame_size_abbrs);
|
||||||
const char *p;
|
char *p;
|
||||||
int frame_width = 0, frame_height = 0;
|
int frame_width = 0, frame_height = 0;
|
||||||
|
|
||||||
for(i=0;i<n;i++) {
|
for(i=0;i<n;i++) {
|
||||||
|
@ -1044,10 +1044,10 @@ int av_parse_video_frame_size(int *width_ptr, int *height_ptr, const char *str)
|
||||||
}
|
}
|
||||||
if (i == n) {
|
if (i == n) {
|
||||||
p = str;
|
p = str;
|
||||||
frame_width = strtol(p, (char **)&p, 10);
|
frame_width = strtol(p, &p, 10);
|
||||||
if (*p)
|
if (*p)
|
||||||
p++;
|
p++;
|
||||||
frame_height = strtol(p, (char **)&p, 10);
|
frame_height = strtol(p, &p, 10);
|
||||||
}
|
}
|
||||||
if (frame_width <= 0 || frame_height <= 0)
|
if (frame_width <= 0 || frame_height <= 0)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue