summaryrefslogtreecommitdiff
path: root/src/libffmpeg/libavcodec/msmpeg4.c
diff options
context:
space:
mode:
authorMiguel Freitas <miguelfreitas@users.sourceforge.net>2001-12-27 21:06:08 +0000
committerMiguel Freitas <miguelfreitas@users.sourceforge.net>2001-12-27 21:06:08 +0000
commit7fec2e354c27250be1207159ab946e7fa10aaf7b (patch)
treeab8a8c9a6fd076dcd59552f99f86c02117c64147 /src/libffmpeg/libavcodec/msmpeg4.c
parentc811e61c80f28552251d296eb205f21175fcef93 (diff)
downloadxine-lib-7fec2e354c27250be1207159ab946e7fa10aaf7b.tar.gz
xine-lib-7fec2e354c27250be1207159ab946e7fa10aaf7b.tar.bz2
updating ffmpeg to cvs version as 26-12-2001
CVS patchset: 1315 CVS date: 2001/12/27 21:06:08
Diffstat (limited to 'src/libffmpeg/libavcodec/msmpeg4.c')
-rw-r--r--src/libffmpeg/libavcodec/msmpeg4.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libffmpeg/libavcodec/msmpeg4.c b/src/libffmpeg/libavcodec/msmpeg4.c
index 63f111bdd..01e3d5438 100644
--- a/src/libffmpeg/libavcodec/msmpeg4.c
+++ b/src/libffmpeg/libavcodec/msmpeg4.c
@@ -30,7 +30,7 @@
* - (encoding) select best vlc/dc table
* - (decoding) handle slice indication
*/
-#undef DEBUG
+//#define DEBUG
/* motion vector table */
typedef struct MVTable {
@@ -664,7 +664,7 @@ int msmpeg4_decode_mb(MpegEncContext *s,
/* special slice handling */
if (s->mb_x == 0) {
- if ((s->mb_y % s->slice_height) == 0) {
+ if (s->slice_height && (s->mb_y % s->slice_height) == 0) {
int wrap;
/* reset DC pred (set previous line to 1024) */
wrap = 2 * s->mb_width + 2;