[FFmpeg-cvslog] Revert "avcodec/wcmv: Avoid copying frames if they are unchanged"

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Tue Sep  3 23:49:00 2019 -0300| [5102999223f2614cf06a8fc801a3f0dd8b0c4ea3] | committer: James Almer

Revert "avcodec/wcmv: Avoid copying frames if they are unchanged"

This reverts commit 976dae8b32f48d17cccfd6b19d2beb01770dfa7c.

An alternative approach to reduce frame copying will follow.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5102999223f2614cf06a8fc801a3f0dd8b0c4ea3
---

 libavcodec/wcmv.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/libavcodec/wcmv.c b/libavcodec/wcmv.c
index 123b29ad4b..2f21c1430c 100644
--- a/libavcodec/wcmv.c
+++ b/libavcodec/wcmv.c
@@ -56,13 +56,11 @@ static int decode_frame(AVCodecContext *avctx,
     }
 
     bytestream2_init(&gb, avpkt->data, avpkt->size);
-    blocks = bytestream2_get_le16(&gb);
-    if (!blocks)
-        return avpkt->size;
 
     if ((ret = ff_reget_buffer(avctx, s->prev_frame, 0)) < 0)
         return ret;
 
+    blocks = bytestream2_get_le16(&gb);
     if (blocks > 5) {
         GetByteContext bgb;
         int x = 0, size;