From 8d74e55b83f00c16790c71251ff4f7ad98f8a37a Mon Sep 17 00:00:00 2001
From: Matthijs Douze <Matthijs.Douze@inrialpes.fr>
Date: Fri, 9 Feb 2007 17:45:28 +0000
Subject: [PATCH] Print error message instead of crashing when combining
-vcodec copy and -vhook. patch by Matthijs Douze, Matthijs.Douze inrialpes fr
Originally committed as revision 7901 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
ffmpeg.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/ffmpeg.c b/ffmpeg.c
index 756c809c287..238109d94c7 100644
--- 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;
--
GitLab