summaryrefslogtreecommitdiff
path: root/src/libffmpeg/diff_to_ffmpeg_cvs.txt
diff options
context:
space:
mode:
Diffstat (limited to 'src/libffmpeg/diff_to_ffmpeg_cvs.txt')
-rw-r--r--src/libffmpeg/diff_to_ffmpeg_cvs.txt11
1 files changed, 11 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
+ }
+