diff options
| -rw-r--r-- | src/libffmpeg/diff_to_ffmpeg_cvs.txt | 11 | ||||
| -rw-r--r-- | src/libffmpeg/libavcodec/dsputil.c | 2 |
2 files changed, 13 insertions, 0 deletions
diff --git a/src/libffmpeg/diff_to_ffmpeg_cvs.txt b/src/libffmpeg/diff_to_ffmpeg_cvs.txt index 9600de365..40c341c04 100644 --- a/src/libffmpeg/diff_to_ffmpeg_cvs.txt +++ b/src/libffmpeg/diff_to_ffmpeg_cvs.txt @@ -415,3 +415,14 @@ +#endif /* #if 0 */ break; #endif +--- libavcodec/dsputil.c 6 May 2005 04:19:18 -0000 1.38 ++++ libavcodec/dsputil.c 7 May 2005 16:24:36 -0000 +@@ -371,6 +371,8 @@ + assert(s>=0); + + return s>>2; ++#else ++ return 0; + #endif + } + diff --git a/src/libffmpeg/libavcodec/dsputil.c b/src/libffmpeg/libavcodec/dsputil.c index 2db9c6631..1ef956cc4 100644 --- a/src/libffmpeg/libavcodec/dsputil.c +++ b/src/libffmpeg/libavcodec/dsputil.c @@ -371,6 +371,8 @@ static inline int w_c(void *v, uint8_t * pix1, uint8_t * pix2, int line_size, in assert(s>=0); return s>>2; +#else + return 0; #endif } |