diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-18 15:00:05 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-18 15:00:05 +0100 |
commit | 5c2fc3bdd7f6da1c12f731419cd60037e9c3c2a4 (patch) | |
tree | 1a966b26141c8815e0ae89153ce8d4c828d51728 /configure | |
parent | 14f79ba18f263a746f91dbd80f4d109fb16105ca (diff) | |
parent | ea061af15ac5629dc8dbeb33b7382d6711a323c3 (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: formatting cosmetics
h264: use mbaff ref indices in fill_colmap() only for mbaff references
Conflicts:
libavcodec/h264_direct.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 12 |
1 files changed, 8 insertions, 4 deletions
@@ -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 |