[SCM] libav/experimental: Remove pointless #ifdef CONFIG_VHOOK from the code. The file is only ever compiled if CONFIG_VHOOK is set.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit c184318852092d0b4bae4930b373c09b9ad0acf4
Author: Diego Biurrun <diego at biurrun.de>
Date:   Tue Sep 2 22:31:41 2008 +0000

    Remove pointless #ifdef CONFIG_VHOOK from the code.
    The file is only ever compiled if CONFIG_VHOOK is set.
    
    Originally committed as revision 15157 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/framehook.c b/libavformat/framehook.c
index eb5184f..90815fb 100644
--- a/libavformat/framehook.c
+++ b/libavformat/framehook.c
@@ -41,7 +41,6 @@ static FrameHookEntry *first_hook;
 /* Returns 0 on OK */
 int frame_hook_add(int argc, char *argv[])
 {
-#ifdef CONFIG_VHOOK
     void *loaded;
     FrameHookEntry *fhe, **fhep;
 
@@ -87,10 +86,6 @@ int frame_hook_add(int argc, char *argv[])
     *fhep = fhe;
 
     return 0;
-#else
-    av_log(NULL, AV_LOG_ERROR, "Video hooking not compiled into this version\n");
-    return 1;
-#endif
 }
 
 void frame_hook_process(AVPicture *pict, enum PixelFormat pix_fmt, int width, int height, int64_t pts)

-- 
Libav/FFmpeg packaging