git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b2a581d
)
Print error message instead of crashing when combining -vcodec copy and -vhook.
author
Matthijs Douze
<Matthijs.Douze@inrialpes.fr>
Fri, 9 Feb 2007 17:45:28 +0000
(17:45 +0000)
committer
Diego 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
patch
|
blob
|
history
diff --git
a/ffmpeg.c
b/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;