[SCM] libav/experimental: Cosmetics: split a long line.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:24:39 UTC 2013


The following commit has been merged in the experimental branch:
commit 58cc7dd9fc30eb7fd5fb255b58c2ca6470b31dd0
Author: Alexander Strange <astrange at ithinksw.com>
Date:   Wed Jul 2 22:28:47 2008 +0000

    Cosmetics: split a long line.
    
    Originally committed as revision 14055 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 26dcd90..c77d9ba 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -2726,7 +2726,8 @@ static void hl_decode_mb(H264Context *h){
     MpegEncContext * const s = &h->s;
     const int mb_xy= h->mb_xy;
     const int mb_type= s->current_picture.mb_type[mb_xy];
-    int is_complex = FRAME_MBAFF || MB_FIELD || IS_INTRA_PCM(mb_type) || s->codec_id != CODEC_ID_H264 || (ENABLE_GRAY && (s->flags&CODEC_FLAG_GRAY)) || (ENABLE_H264_ENCODER && s->encoding) || ENABLE_SMALL;
+    int is_complex = FRAME_MBAFF || MB_FIELD || IS_INTRA_PCM(mb_type) || s->codec_id != CODEC_ID_H264 ||
+                    (ENABLE_GRAY && (s->flags&CODEC_FLAG_GRAY)) || (ENABLE_H264_ENCODER && s->encoding) || ENABLE_SMALL;
 
     if(ENABLE_H264_ENCODER && !s->decode)
         return;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list