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

Unified Diff: source/patched-ffmpeg-mt/libavdevice/v4l2.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « source/patched-ffmpeg-mt/libavdevice/v4l.c ('k') | source/patched-ffmpeg-mt/libavfilter/Makefile » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/patched-ffmpeg-mt/libavdevice/v4l2.c
===================================================================
--- source/patched-ffmpeg-mt/libavdevice/v4l2.c (revision 59334)
+++ source/patched-ffmpeg-mt/libavdevice/v4l2.c (working copy)
@@ -139,6 +139,11 @@
.v4l2_fmt = V4L2_PIX_FMT_GREY,
},
{
+ .ff_fmt = PIX_FMT_NV12,
+ .codec_id = CODEC_ID_RAWVIDEO,
+ .v4l2_fmt = V4L2_PIX_FMT_NV12,
+ },
+ {
.ff_fmt = PIX_FMT_NONE,
.codec_id = CODEC_ID_MJPEG,
.v4l2_fmt = V4L2_PIX_FMT_MJPEG,
@@ -624,7 +629,7 @@
return AVERROR(EIO);
}
- if (av_check_image_size(s->width, s->height, 0, s1) < 0)
+ if (av_image_check_size(s->width, s->height, 0, s1) < 0)
return AVERROR(EINVAL);
s->frame_format = desired_format;
« no previous file with comments | « source/patched-ffmpeg-mt/libavdevice/v4l.c ('k') | source/patched-ffmpeg-mt/libavfilter/Makefile » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698