[FFmpeg-cvslog] Merge commit 'f2f145f3032bc8808708a4bd694fbce5f1b8b63c'

[Clément Bœsch]

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

Merge commit 'f2f145f3032bc8808708a4bd694fbce5f1b8b63c'

* commit 'f2f145f3032bc8808708a4bd694fbce5f1b8b63c':
  msmpeg4: Drop disabled debug cruft

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

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

 libavcodec/msmpeg4dec.c | 7 -------
 libavcodec/msmpeg4enc.c | 5 -----
 2 files changed, 12 deletions(-)

diff --git a/libavcodec/msmpeg4dec.c b/libavcodec/msmpeg4dec.c
index b45e751..cf43027 100644
--- a/libavcodec/msmpeg4dec.c
+++ b/libavcodec/msmpeg4dec.c
@@ -414,13 +414,6 @@ int ff_msmpeg4_decode_picture_header(MpegEncContext * s)
         av_log(s->avctx, AV_LOG_ERROR, "invalid picture type\n");
         return -1;
     }
-#if 0
-{
-    static int had_i=0;
-    if(s->pict_type == AV_PICTURE_TYPE_I) had_i=1;
-    if(!had_i) return -1;
-}
-#endif
     s->chroma_qscale= s->qscale = get_bits(&s->gb, 5);
     if(s->qscale==0){
         av_log(s->avctx, AV_LOG_ERROR, "invalid qscale\n");
diff --git a/libavcodec/msmpeg4enc.c b/libavcodec/msmpeg4enc.c
index 07241e8..144468b 100644
--- a/libavcodec/msmpeg4enc.c
+++ b/libavcodec/msmpeg4enc.c
@@ -314,11 +314,6 @@ void ff_msmpeg4_encode_motion(MpegEncContext * s,
 
     mx += 32;
     my += 32;
-#if 0
-    if ((unsigned)mx >= 64 ||
-        (unsigned)my >= 64)
-        av_log(s->avctx, AV_LOG_ERROR, "error mx=%d my=%d\n", mx, my);
-#endif
     mv = &ff_mv_tables[s->mv_table_index];
 
     code = mv->table_mv_index[(mx << 6) | my];


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