virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Remove unnecessary ret variable.

Browse Source 
Originally committed as revision 16033 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini 2008-12-07 22:52:32 +00:00
parent 36b532815c
commit b9f382c8ef
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavdevice/v4l.c
View File

@ -72,7 +72,7 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)
AVStream *st; AVStream *st;
int width, height; int width, height;
int video_fd, frame_size; int video_fd, frame_size;
int ret, frame_rate, frame_rate_base; int frame_rate, frame_rate_base;
int desired_palette, desired_depth; int desired_palette, desired_depth;
struct video_tuner tuner; struct video_tuner tuner;
struct video_audio audio; struct video_audio audio;
@ -167,7 +167,7 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)
/* try to choose a suitable video format */ /* try to choose a suitable video format */
pict.palette = desired_palette; pict.palette = desired_palette;
pict.depth= desired_depth; pict.depth= desired_depth;
if (desired_palette == -1 || (ret = ioctl(video_fd, VIDIOCSPICT, &pict)) < 0) { if (desired_palette == -1 || ioctl(video_fd, VIDIOCSPICT, &pict) < 0) {
for (j = 0; j < vformat_num; j++) { for (j = 0; j < vformat_num; j++) {
pict.palette = video_formats[j].palette; pict.palette = video_formats[j].palette;
pict.depth = video_formats[j].depth; pict.depth = video_formats[j].depth;
@ -178,8 +178,7 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)
goto fail1; goto fail1;
} }
ret = ioctl(video_fd,VIDIOCGMBUF,&s->gb_buffers); if (ioctl(video_fd,VIDIOCGMBUF,&s->gb_buffers) < 0) {
if (ret < 0) {
/* try to use read based access */ /* try to use read based access */
struct video_window win; struct video_window win;
int val; int val;
@ -218,8 +217,7 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)
s->gb_buf.width = width; s->gb_buf.width = width;
s->gb_buf.format = pict.palette; s->gb_buf.format = pict.palette;
ret = ioctl(video_fd, VIDIOCMCAPTURE, &s->gb_buf); if (ioctl(video_fd, VIDIOCMCAPTURE, &s->gb_buf) < 0) {
if (ret < 0) {
if (errno != EAGAIN) { if (errno != EAGAIN) {
fail1: fail1:
av_log(s1, AV_LOG_ERROR, "Fatal: grab device does not support suitable format\n"); av_log(s1, AV_LOG_ERROR, "Fatal: grab device does not support suitable format\n");