[FFmpeg-cvslog] flashsv2enc: fix prev-Z-prime encoding

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Sep  7 21:05:18 2012 +0200| [9b326fc2611f511863a483d361e35c66e27d4f64] | committer: Michael Niedermayer

flashsv2enc: fix prev-Z-prime encoding

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/flashsv2enc.c        |    2 +-
 tests/ref/fate/vsynth1-flashsv2 |    2 +-
 tests/ref/fate/vsynth2-flashsv2 |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/flashsv2enc.c b/libavcodec/flashsv2enc.c
index d678aa7..008ebe0 100644
--- a/libavcodec/flashsv2enc.c
+++ b/libavcodec/flashsv2enc.c
@@ -262,7 +262,7 @@ static int new_key_frame(FlashSV2Context * s)
         s->key_blocks[i].sl_end   = 0;
         s->key_blocks[i].data     = 0;
     }
-    FFSWAP(uint8_t * , s->keybuffer, s->encbuffer);
+    memcpy(s->keybuffer, s->encbuffer, s->frame_size);
 
     return 0;
 }
diff --git a/tests/ref/fate/vsynth1-flashsv2 b/tests/ref/fate/vsynth1-flashsv2
index d21d63f..f8c2ed1 100644
--- a/tests/ref/fate/vsynth1-flashsv2
+++ b/tests/ref/fate/vsynth1-flashsv2
@@ -1,4 +1,4 @@
-8d105780bb79915bc36f96f7a754f289 *tests/data/fate/vsynth1-flashsv2.flv
+e3403ea852029daf589a7a4dfd8f6cae *tests/data/fate/vsynth1-flashsv2.flv
 9371095 tests/data/fate/vsynth1-flashsv2.flv
 efa88d09115a2e947eff00ee435ba3f3 *tests/data/fate/vsynth1-flashsv2.out.rawvideo
 stddev:    3.47 PSNR: 37.31 MAXDIFF:   49 bytes:  7603200/  7603200
diff --git a/tests/ref/fate/vsynth2-flashsv2 b/tests/ref/fate/vsynth2-flashsv2
index 0ccfb91..580ad97 100644
--- a/tests/ref/fate/vsynth2-flashsv2
+++ b/tests/ref/fate/vsynth2-flashsv2
@@ -1,4 +1,4 @@
-3f4a7454fa664896ac7532e3551c4071 *tests/data/fate/vsynth2-flashsv2.flv
+4baf149705dbbd8084879d692e6acc8a *tests/data/fate/vsynth2-flashsv2.flv
 9293862 tests/data/fate/vsynth2-flashsv2.flv
 8f63e24049ba1789a7f8353c695a3d99 *tests/data/fate/vsynth2-flashsv2.out.rawvideo
 stddev:    2.39 PSNR: 40.55 MAXDIFF:   21 bytes:  7603200/  7603200