diff options
author | Matthijs Douze <Matthijs.Douze@inrialpes.fr> | 2007-02-09 17:45:28 +0000 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2007-02-09 17:45:28 +0000 |
commit | 8d74e55b83f00c16790c71251ff4f7ad98f8a37a (patch) | |
tree | a3ab42cda44b68c40d550543b764bc1b98c90e53 /ffmpeg.c | |
parent | b2a581dc71806df7aac7933b953a6ca410efd4bc (diff) | |
download | ffmpeg-streaming-8d74e55b83f00c16790c71251ff4f7ad98f8a37a.zip ffmpeg-streaming-8d74e55b83f00c16790c71251ff4f7ad98f8a37a.tar.gz |
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
Diffstat (limited to 'ffmpeg.c')
-rw-r--r-- | ffmpeg.c | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -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; |