[Ffmpeg-cvslog] r7901 - trunk/ffmpeg.c

[diego]

Author: diego
Date: Fri Feb  9 18:45:28 2007
New Revision: 7901

Modified:
   trunk/ffmpeg.c

Log:
Print error message instead of crashing when combining -vcodec copy and -vhook.
patch by Matthijs Douze, Matthijs.Douze inrialpes fr


Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	(original)
+++ trunk/ffmpeg.c	Fri Feb  9 18:45:28 2007
@@ -1543,6 +1543,10 @@
                 codec->block_align= icodec->block_align;
                 break;
             case CODEC_TYPE_VIDEO:
+                if(using_vhook) {
+                    fprintf(stderr,"-vcodec copy and -vhook are incompatible (frames are not decoded)\n");
+                    exit(1);
+                }
                 codec->pix_fmt = icodec->pix_fmt;
                 codec->width = icodec->width;
                 codec->height = icodec->height;