Commit 8d74e55b authored by Matthijs Douze's avatar Matthijs Douze Committed by Diego Biurrun

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
parent b2a581dc
...@@ -1543,6 +1543,10 @@ static int av_encode(AVFormatContext **output_files, ...@@ -1543,6 +1543,10 @@ static int av_encode(AVFormatContext **output_files,
codec->block_align= icodec->block_align; codec->block_align= icodec->block_align;
break; break;
case CODEC_TYPE_VIDEO: 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->pix_fmt = icodec->pix_fmt;
codec->width = icodec->width; codec->width = icodec->width;
codec->height = icodec->height; 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