typo

[ffmpeg.git] / libavdevice / vfwcap.c

diff --git a/libavdevice/vfwcap.c b/libavdevice/vfwcap.c
index ababab9..cfd49b6 100644 (file)
--- a/libavdevice/vfwcap.c
+++ b/libavdevice/vfwcap.c
@@ -96,6 +96,8 @@ static enum PixelFormat vfw_pixfmt(DWORD biCompression, WORD biBitCount)
     switch(biCompression) {
     case MKTAG('Y', 'U', 'Y', '2'):
         return PIX_FMT_YUYV422;
+    case MKTAG('I', '4', '2', '0'):
+        return PIX_FMT_YUV420P;
     case BI_RGB:
         switch(biBitCount) { /* 1-8 are untested */
             case 1:
@@ -298,19 +300,16 @@ static int vfw_read_header(AVFormatContext *s, AVFormatParameters *ap)
 
     /* Set video format */
     bisize = SendMessage(ctx->hwnd, WM_CAP_GET_VIDEOFORMAT, 0, 0);
-    if(!bisize) {
+    if(!bisize)
         goto fail_io;
-    }
     bi = av_malloc(bisize);
     if(!bi) {
         vfw_read_close(s);
         return AVERROR_NOMEM;
     }
     ret = SendMessage(ctx->hwnd, WM_CAP_GET_VIDEOFORMAT, bisize, (LPARAM) bi);
-    if(!ret) {
-        av_free(bi);
-        goto fail_io;
-    }
+    if(!ret)
+        goto fail_bi;
 
     dump_bih(s, &bi->bmiHeader);
 
@@ -319,11 +318,22 @@ static int vfw_read_header(AVFormatContext *s, AVFormatParameters *ap)
     bi->bmiHeader.biWidth  = width ;
     bi->bmiHeader.biHeight = height;
 
+#if 0
+    /* For testing yet unsupported compressions
+     * Copy these values from user-supplied verbose information */
+    bi->bmiHeader.biWidth       = 320;
+    bi->bmiHeader.biHeight      = 240;
+    bi->bmiHeader.biPlanes      = 1;
+    bi->bmiHeader.biBitCount    = 12;
+    bi->bmiHeader.biCompression = MKTAG('I','4','2','0');
+    bi->bmiHeader.biSizeImage   = 115200;
+    dump_bih(s, &bi->bmiHeader);
+#endif
+
     ret = SendMessage(ctx->hwnd, WM_CAP_SET_VIDEOFORMAT, bisize, (LPARAM) bi);
     if(!ret) {
         av_log(s, AV_LOG_ERROR, "Could not set Video Format.\n");
-        av_free(bi);
-        goto fail_io;
+        goto fail_bi;
     }
 
     biCompression = bi->bmiHeader.biCompression;
@@ -334,9 +344,8 @@ static int vfw_read_header(AVFormatContext *s, AVFormatParameters *ap)
     /* Set sequence setup */
     ret = SendMessage(ctx->hwnd, WM_CAP_GET_SEQUENCE_SETUP, sizeof(cparms),
                       (LPARAM) &cparms);
-    if(!ret) {
+    if(!ret)
         goto fail_io;
-    }
 
     dump_captureparms(s, &cparms);
 
@@ -350,9 +359,8 @@ static int vfw_read_header(AVFormatContext *s, AVFormatParameters *ap)
 
     ret = SendMessage(ctx->hwnd, WM_CAP_SET_SEQUENCE_SETUP, sizeof(cparms),
                       (LPARAM) &cparms);
-    if(!ret) {
+    if(!ret)
         goto fail_io;
-    }
 
     codec = st->codec;
     codec->time_base = ap->time_base;
@@ -392,6 +400,9 @@ static int vfw_read_header(AVFormatContext *s, AVFormatParameters *ap)
 
     return 0;
 
+fail_bi:
+    av_free(bi);
+
 fail_io:
     vfw_read_close(s);
     return AVERROR_IO;