Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(13)

Side by Side Diff: source/patched-ffmpeg-mt/libavdevice/v4l.c

Issue 3384002: ffmpeg source update for sep 09 (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: Created 10 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Linux video grab interface 2 * Linux video grab interface
3 * Copyright (c) 2000,2001 Fabrice Bellard 3 * Copyright (c) 2000,2001 Fabrice Bellard
4 * 4 *
5 * This file is part of FFmpeg. 5 * This file is part of FFmpeg.
6 * 6 *
7 * FFmpeg is free software; you can redistribute it and/or 7 * FFmpeg is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Lesser General Public 8 * modify it under the terms of the GNU Lesser General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2.1 of the License, or (at your option) any later version. 10 * version 2.1 of the License, or (at your option) any later version.
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 } 110 }
111 111
112 /* no values set, autodetect them */ 112 /* no values set, autodetect them */
113 if (s->video_win.width <= 0 || s->video_win.height <= 0) { 113 if (s->video_win.width <= 0 || s->video_win.height <= 0) {
114 if (ioctl(video_fd, VIDIOCGWIN, &s->video_win, sizeof(s->video_win)) < 0 ) { 114 if (ioctl(video_fd, VIDIOCGWIN, &s->video_win, sizeof(s->video_win)) < 0 ) {
115 av_log(s1, AV_LOG_ERROR, "VIDIOCGWIN: %s\n", strerror(errno)); 115 av_log(s1, AV_LOG_ERROR, "VIDIOCGWIN: %s\n", strerror(errno));
116 goto fail; 116 goto fail;
117 } 117 }
118 } 118 }
119 119
120 if(av_check_image_size(s->video_win.width, s->video_win.height, 0, s1) < 0) 120 if(av_image_check_size(s->video_win.width, s->video_win.height, 0, s1) < 0)
121 return -1; 121 return -1;
122 122
123 desired_palette = -1; 123 desired_palette = -1;
124 desired_depth = -1; 124 desired_depth = -1;
125 for (j = 0; j < vformat_num; j++) { 125 for (j = 0; j < vformat_num; j++) {
126 if (ap->pix_fmt == video_formats[j].pix_fmt) { 126 if (ap->pix_fmt == video_formats[j].pix_fmt) {
127 desired_palette = video_formats[j].palette; 127 desired_palette = video_formats[j].palette;
128 desired_depth = video_formats[j].depth; 128 desired_depth = video_formats[j].depth;
129 break; 129 break;
130 } 130 }
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
342 AVInputFormat v4l_demuxer = { 342 AVInputFormat v4l_demuxer = {
343 "video4linux", 343 "video4linux",
344 NULL_IF_CONFIG_SMALL("Video4Linux device grab"), 344 NULL_IF_CONFIG_SMALL("Video4Linux device grab"),
345 sizeof(VideoData), 345 sizeof(VideoData),
346 NULL, 346 NULL,
347 grab_read_header, 347 grab_read_header,
348 grab_read_packet, 348 grab_read_packet,
349 grab_read_close, 349 grab_read_close,
350 .flags = AVFMT_NOFILE, 350 .flags = AVFMT_NOFILE,
351 }; 351 };
OLDNEW
« no previous file with comments | « source/patched-ffmpeg-mt/libavdevice/oss_audio.c ('k') | source/patched-ffmpeg-mt/libavdevice/v4l2.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698