diff options
| author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2002-07-15 19:42:40 +0000 |
|---|---|---|
| committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2002-07-15 19:42:40 +0000 |
| commit | 01ef70db6c2a280d96ddce6e6272a4813e047c9b (patch) | |
| tree | 38a5cf0a9b7500f5b06dbe5de93548985dcb0185 /src/libffmpeg/libavcodec/mjpeg.c | |
| parent | c6b394300792eb277b16b25bfca864c8bcbed7db (diff) | |
| download | xine-lib-01ef70db6c2a280d96ddce6e6272a4813e047c9b.tar.gz xine-lib-01ef70db6c2a280d96ddce6e6272a4813e047c9b.tar.bz2 | |
update to ffmpeg cvs
CVS patchset: 2277
CVS date: 2002/07/15 19:42:40
Diffstat (limited to 'src/libffmpeg/libavcodec/mjpeg.c')
| -rw-r--r-- | src/libffmpeg/libavcodec/mjpeg.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/libffmpeg/libavcodec/mjpeg.c b/src/libffmpeg/libavcodec/mjpeg.c index ccaf37e38..5beb47e17 100644 --- a/src/libffmpeg/libavcodec/mjpeg.c +++ b/src/libffmpeg/libavcodec/mjpeg.c @@ -372,10 +372,10 @@ static void jpeg_put_comments(MpegEncContext *s) flush_put_bits(p); ptr = pbBufPtr(p); put_bits(p, 16, 0); /* patched later */ -#define VERSION "FFmpeg" LIBAVCODEC_VERSION "b" LIBAVCODEC_BUILD_STR - put_string(p, VERSION); - size = strlen(VERSION)+3; -#undef VERSION +#define MJPEG_VERSION "FFmpeg" LIBAVCODEC_VERSION "b" LIBAVCODEC_BUILD_STR + put_string(p, MJPEG_VERSION); + size = strlen(MJPEG_VERSION)+3; +#undef MJPEG_VERSION ptr[0] = size >> 8; ptr[1] = size; } @@ -1247,7 +1247,7 @@ static int mjpeg_decode_frame(AVCodecContext *avctx, s->bottom_field ^= 1; /* if not bottom field, do not output image yet */ if (s->bottom_field) - goto the_end; + goto not_the_end; } for(i=0;i<3;i++) { picture->data[i] = s->current_picture[i]; @@ -1313,6 +1313,8 @@ static int mjpeg_decode_frame(AVCodecContext *avctx, #endif } } + not_the_end: + ; } the_end: return buf_ptr - buf; |