Print error message instead of crashing when combining -vcodec copy and -vhook.
authorMatthijs Douze <Matthijs.Douze@inrialpes.fr>
Fri, 9 Feb 2007 17:45:28 +0000 (17:45 +0000)
committerDiego Biurrun <diego@biurrun.de>
Fri, 9 Feb 2007 17:45:28 +0000 (17:45 +0000)
patch by Matthijs Douze, Matthijs.Douze inrialpes fr

Originally committed as revision 7901 to svn://svn.ffmpeg.org/ffmpeg/trunk

ffmpeg.c

index 756c809..238109d 100644 (file)
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1543,6 +1543,10 @@ static int av_encode(AVFormatContext **output_files,
                 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;