[SCM] libav/experimental: cosmetic addition of {}
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 17:02:42 UTC 2013
The following commit has been merged in the experimental branch:
commit 1a29c6a0bb92e3765a05f8c6e67c534b719d97d4
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Wed Mar 3 19:32:50 2010 +0000
cosmetic addition of {}
Originally committed as revision 22178 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 8ead923..08ffe3a 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -2004,9 +2004,9 @@ static int decode_slice_header(H264Context *h, H264Context *h0){
if( (h->pps.weighted_pred && h->slice_type_nos == FF_P_TYPE )
|| (h->pps.weighted_bipred_idc==1 && h->slice_type_nos== FF_B_TYPE ) )
pred_weight_table(h);
- else if(h->pps.weighted_bipred_idc==2 && h->slice_type_nos== FF_B_TYPE)
+ else if(h->pps.weighted_bipred_idc==2 && h->slice_type_nos== FF_B_TYPE){
implicit_weight_table(h);
- else {
+ }else {
h->use_weight = 0;
for (i = 0; i < 2; i++) {
h->luma_weight_flag[i] = 0;
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list