Commit d6237e2e authored by diego's avatar diego

Print error message instead of crashing when combining -vcodec copy and -vhook.

patch by Matthijs Douze, Matthijs.Douze inrialpes fr


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@7901 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 53f658b1
......@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment