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

Fixes detection and error reporting of non-existing files in img2.c.

Browse Source 
Patch by Samuli Valo: name surname picturall com

Originally committed as revision 20346 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Samuli Valo 2009-10-22 16:27:01 +00:00 committed by Benoit Fouet
parent bb7d0e87ae
commit c671ac40f5
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/img2.c
View File

@ -128,7 +128,9 @@ static int find_image_range(int *pfirst_index, int *plast_index,
if (av_get_frame_filename(buf, sizeof(buf), path, first_index) < 0){ if (av_get_frame_filename(buf, sizeof(buf), path, first_index) < 0){
*pfirst_index = *pfirst_index =
*plast_index = 1; *plast_index = 1;
return 0; if(url_exist(buf))
return 0;
return -1;
} }
if (url_exist(buf)) if (url_exist(buf))
break; break;
@ -221,7 +223,7 @@ static int img_read_header(AVFormatContext *s1, AVFormatParameters *ap)
if (!s->is_pipe) { if (!s->is_pipe) {
if (find_image_range(&first_index, &last_index, s->path) < 0) if (find_image_range(&first_index, &last_index, s->path) < 0)
return AVERROR(EIO); return AVERROR(ENOENT);
s->img_first = first_index; s->img_first = first_index;
s->img_last = last_index; s->img_last = last_index;
s->img_number = first_index; s->img_number = first_index;