[SCM] libav/experimental: Print error message instead of crashing when combining -vcodec copy and -vhook. patch by Matthijs Douze, Matthijs.Douze inrialpes fr

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 8d74e55b83f00c16790c71251ff4f7ad98f8a37a
Author: Matthijs Douze <Matthijs.Douze at inrialpes.fr>
Date:   Fri Feb 9 17:45:28 2007 +0000

    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

diff --git a/ffmpeg.c b/ffmpeg.c
index 756c809..238109d 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;

-- 
Libav/FFmpeg packaging