hpel_motion_search: move code used for asserts under correct #if

[ffmpeg] / libavcodec / cinepak.c

diff --git a/libavcodec/cinepak.c b/libavcodec/cinepak.c
index 9ae63b743264bede996cd7b3aa188a818f0e93d9..b323da4741156558611c3cccacaf4f28936b07bd 100644 (file)
--- a/libavcodec/cinepak.c
+++ b/libavcodec/cinepak.c
@@ -334,7 +334,7 @@ static int cinepak_decode (CinepakContext *s)
     if (s->sega_film_skip_bytes == -1) {
         if (!encoded_buf_size) {
             av_log_ask_for_sample(s->avctx, "encoded_buf_size is 0");
-            return AVERROR_INVALIDDATA;
+            return AVERROR_PATCHWELCOME;
         }
         if (encoded_buf_size != s->size && (s->size % encoded_buf_size) != 0) {
             /* If the encoded frame size differs from the frame size as indicated
@@ -425,7 +425,7 @@ static av_cold int cinepak_decode_init(AVCodecContext *avctx)
 }
 
 static int cinepak_decode_frame(AVCodecContext *avctx,
-                                void *data, int *data_size,
+                                void *data, int *got_frame,
                                 AVPacket *avpkt)
 {
     const uint8_t *buf = avpkt->data;
@@ -456,7 +456,7 @@ static int cinepak_decode_frame(AVCodecContext *avctx,
     if (s->palette_video)
         memcpy (s->frame.data[1], s->pal, AVPALETTE_SIZE);
 
-    *data_size = sizeof(AVFrame);
+    *got_frame = 1;
     *(AVFrame*)data = s->frame;
 
     /* report that the buffer was completely consumed */