summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xconfigure12
-rw-r--r--libavcodec/h264_direct.c4
2 files changed, 10 insertions, 6 deletions
diff --git a/configure b/configure
index a50d073c4e..a109a55d3c 100755
--- a/configure
+++ b/configure
@@ -2229,13 +2229,17 @@ do_random(){
for opt do
optval="${opt#*=}"
case "$opt" in
- --extra-ldflags=*) add_ldflags $optval
+ --extra-ldflags=*)
+ add_ldflags $optval
;;
- --extra-libs=*) add_extralibs $optval
+ --extra-libs=*)
+ add_extralibs $optval
;;
- --disable-devices) disable $INDEV_LIST $OUTDEV_LIST
+ --disable-devices)
+ disable $INDEV_LIST $OUTDEV_LIST
;;
- --enable-debug=*) debuglevel="$optval"
+ --enable-debug=*)
+ debuglevel="$optval"
;;
--disable-programs)
disable $PROGRAM_LIST
diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c
index 9ef5862472..1373e23eb4 100644
--- a/libavcodec/h264_direct.c
+++ b/libavcodec/h264_direct.c
@@ -89,8 +89,8 @@ static void fill_colmap(H264Context *h, int map[2][16+32], int list, int field,
for(j=start; j<end; j++){
if (4 * h->ref_list[0][j].frame_num + (h->ref_list[0][j].f.reference & 3) == poc) {
int cur_ref= mbafi ? (j-16)^field : j;
- if(ref1->mbaff)
- map[list][2*old_ref + (rfield^field) + 16] = cur_ref;
+ if (ref1->mbaff)
+ map[list][2 * old_ref + (rfield^field) + 16] = cur_ref;
if(rfield == field || !interl)
map[list][old_ref] = cur_ref;
break;