enable stream copy with ffserver, to be able to chain

[ffmpeg] / libavcodec / motion_est.c

diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c
index b97b4413051b32a7d92d95ae0266532e285f8339..d3877c0682a9adf43c146ab3de1681e5174b0eca 100644 (file)
--- a/libavcodec/motion_est.c
+++ b/libavcodec/motion_est.c
@@ -231,7 +231,7 @@ static int zero_cmp(void *s, uint8_t *a, uint8_t *b, int stride, int h){
 static void zero_hpel(uint8_t *a, const uint8_t *b, int stride, int h){
 }
 
-void ff_init_me(MpegEncContext *s){
+int ff_init_me(MpegEncContext *s){
     MotionEstContext * const c= &s->me;
     int cache_size= FFMIN(ME_MAP_SIZE>>ME_MAP_SHIFT, 1<<ME_MAP_SHIFT);
     int dia_size= FFMAX(FFABS(s->avctx->dia_size)&255, FFABS(s->avctx->pre_dia_size)&255);
@@ -303,6 +303,8 @@ void ff_init_me(MpegEncContext *s){
     }
 
     c->temp= c->scratchpad;
+
+    return 0;
 }
 
 #if 0