[FFmpeg-cvslog] Merge commit 'dab2034b8679aaacd8aef832cdeb71d0ee8a3358'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sun Mar 19 15:49:15 2017 +0100| [4ded6f9b312731a7cbac7da2c097eeeab8c1954e] | committer: Clément Bœsch

Merge commit 'dab2034b8679aaacd8aef832cdeb71d0ee8a3358'

* commit 'dab2034b8679aaacd8aef832cdeb71d0ee8a3358':
  roqvideoenc: Drop broken disabled cruft

Merged-by: Clément Bœsch <u at pkh.me>

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

 libavcodec/roqvideoenc.c | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/libavcodec/roqvideoenc.c b/libavcodec/roqvideoenc.c
index 038a63d..ac05123 100644
--- a/libavcodec/roqvideoenc.c
+++ b/libavcodec/roqvideoenc.c
@@ -736,21 +736,6 @@ static void reconstruct_and_encode_image(RoqContext *enc, RoqTempdata *tempData,
     /* Flush the remainder of the argument/type spool */
     while (spool.typeSpoolLength)
         write_typecode(&spool, 0x0);
-
-#if 0
-    uint8_t *fdata[3] = {enc->frame_to_enc->data[0],
-                           enc->frame_to_enc->data[1],
-                           enc->frame_to_enc->data[2]};
-    uint8_t *cdata[3] = {enc->current_frame->data[0],
-                           enc->current_frame->data[1],
-                           enc->current_frame->data[2]};
-    av_log(enc->avctx, AV_LOG_ERROR, "Expected distortion: %i Actual: %i\n",
-           dist,
-           block_sse(fdata, cdata, 0, 0, 0, 0,
-                     enc->frame_to_enc->linesize,
-                     enc->current_frame->linesize,
-                     enc->width));  //WARNING: Square dimensions implied...
-#endif
 }
 
 


======================================================================