[SCM] libav/experimental: 100l Forgoten hunk.unbreak compile before someone notices.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:59:55 UTC 2013
The following commit has been merged in the experimental branch:
commit 923bcb404804dae142e878cf05115dfbf2d35cd7
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Sat Feb 13 13:04:11 2010 +0000
100l Forgoten hunk.unbreak compile before someone notices.
Originally committed as revision 21789 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c
index a8fb6b3..bcdb542 100644
--- a/libavcodec/h264_direct.c
+++ b/libavcodec/h264_direct.c
@@ -379,7 +379,6 @@ single_col:
if(!is_b8x8 && !(n&15))
*mb_type= (*mb_type & ~(MB_TYPE_8x8|MB_TYPE_16x8|MB_TYPE_8x16|MB_TYPE_P1L0|MB_TYPE_P1L1))|MB_TYPE_16x16|MB_TYPE_DIRECT2;
}
- }
}
static void pred_temp_direct_motion(H264Context * const h, int *mb_type){
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list