[FFmpeg-cvslog] mjpegdec: use put_pixels instead of copy_block8

Mans Rullgard git at videolan.org
Sat Feb 9 12:42:52 CET 2013


ffmpeg | branch: master | Mans Rullgard <mans at mansr.com> | Mon Dec 10 09:57:10 2012 +0000| [ed62e6e3c3ca8066456392d5e0dbe12c49d67a6c] | committer: Diego Biurrun

mjpegdec: use put_pixels instead of copy_block8

Signed-off-by: Mans Rullgard <mans at mansr.com>

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

 libavcodec/mjpegdec.c |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index d13c85e..e63287a 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -864,8 +864,9 @@ static int mjpeg_decode_scan(MJpegDecodeContext *s, int nb_components, int Ah,
                     ptr = data[c] + block_offset;
                     if (!s->progressive) {
                         if (copy_mb)
-                            copy_block8(ptr, reference_data[c] + block_offset,
-                                        linesize[c], linesize[c], 8);
+                            s->dsp.put_pixels_tab[1][0](ptr,
+                                reference_data[c] + block_offset,
+                                linesize[c], 8);
                         else {
                             s->dsp.clear_block(s->block);
                             if (decode_block(s, s->block, i,
@@ -979,8 +980,9 @@ static int mjpeg_decode_scan_progressive_ac(MJpegDecodeContext *s, int ss,
 
             if (last_scan) {
                 if (copy_mb) {
-                    copy_block8(ptr, reference_data + block_offset,
-                                linesize, linesize, 8);
+                    s->dsp.put_pixels_tab[1][0](ptr,
+                                                reference_data + block_offset,
+                                                linesize, 8);
                 } else {
                     s->dsp.idct_put(ptr, linesize, *block);
                     ptr += 8;



More information about the ffmpeg-cvslog mailing list