Merge commit '2cbc8dfeddcbe00ef5f112162912bb49c1dd6623' into release/0.10

* commit '2cbc8dfeddcbe00ef5f112162912bb49c1dd6623': h264: check buffer size before accessing it configure: use utilities from /usr/xpg4/bin if it exists Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03 01:26:46 +02:00 · 2014-06-03 01:26:46 +02:00 · ef076d3bd6
commit ef076d3bd6
parent 2b40afae70 2cbc8dfedd
1 changed files with 2 additions and 0 deletions
--- a/2
+++ b/2
@ -54,6 +54,8 @@ if test "$E1" != 0 || test "$E2" = 0; then
    exit 1
 fi

+test -d /usr/xpg4/bin && PATH=/usr/xpg4/bin:$PATH
+
 show_help(){
 cat <<EOF
 Usage: configure [options]