[FFmpeg-cvslog] Merge commit '9c858ce33fa9b94ebc320dd9d9fa423e708e90cc'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <clement at stupeflix.com> | Mon Jun 20 15:36:44 2016 +0200| [fabdb7505a7b8b8bb15c2f3b652a4fb03a8dd6f3] | committer: Clément Bœsch

Merge commit '9c858ce33fa9b94ebc320dd9d9fa423e708e90cc'

* commit '9c858ce33fa9b94ebc320dd9d9fa423e708e90cc':
  h264: remove a pointless comment

Merged-by: Clément Bœsch <clement at stupeflix.com>

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

 libavcodec/h264_slice.c |    3 ---
 1 file changed, 3 deletions(-)

diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index 8d8e939..4f62b74 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -1937,9 +1937,6 @@ static int fill_filter_caches(const H264Context *h, H264SliceContext *sl, int mb
 
     top_xy = mb_xy - (h->mb_stride << MB_FIELD(sl));
 
-    /* Wow, what a mess, why didn't they simplify the interlacing & intra
-     * stuff, I can't imagine that these complex rules are worth it. */
-
     left_xy[LBOT] = left_xy[LTOP] = mb_xy - 1;
     if (FRAME_MBAFF(h)) {
         const int left_mb_field_flag = IS_INTERLACED(h->cur_pic.mb_type[mb_xy - 1]);


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