Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Sep 2012 09:46:47 +0000 (11:46 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Sep 2012 09:46:47 +0000 (11:46 +0200)
* qatar/master:
  utvideoenc: Add missing AV_ prefix to codec ID
  avserver: Add missing #include for av_gettime()
  configure: Only disable aligned stack on MSVC on 32 bit
  configure: indentation cosmetics

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure
ffserver.c
libavcodec/utvideoenc.c

diff --cc configure
+++ b/configure
@@@ -3114,16 -2803,15 +3113,16 @@@ case $target_os i
          SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME)-$(LIBVERSION)$(SLIBSUF)'
          SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(shell echo $(NAME) | cut -c1-6)$(LIBMAJOR)$(SLIBSUF)'
          SLIB_CREATE_DEF_CMD='echo LIBRARY $(SLIBNAME_WITH_MAJOR) INITINSTANCE TERMINSTANCE > $(SUBDIR)$(NAME).def; \
-           echo PROTMODE >> $(SUBDIR)$(NAME).def; \
-           echo CODE PRELOAD MOVEABLE DISCARDABLE >> $(SUBDIR)$(NAME).def; \
-           echo DATA PRELOAD MOVEABLE MULTIPLE NONSHARED >> $(SUBDIR)$(NAME).def; \
-           echo EXPORTS >> $(SUBDIR)$(NAME).def; \
-           emxexp -o $(OBJS) >> $(SUBDIR)$(NAME).def'
+             echo PROTMODE >> $(SUBDIR)$(NAME).def; \
+             echo CODE PRELOAD MOVEABLE DISCARDABLE >> $(SUBDIR)$(NAME).def; \
+             echo DATA PRELOAD MOVEABLE MULTIPLE NONSHARED >> $(SUBDIR)$(NAME).def; \
+             echo EXPORTS >> $(SUBDIR)$(NAME).def; \
+             emxexp -o $(OBJS) >> $(SUBDIR)$(NAME).def'
          SLIB_EXTRA_CMD='emximp -o $(SUBDIR)$(LIBPREF)$(NAME)_dll.a $(SUBDIR)$(NAME).def; \
-           emximp -o $(SUBDIR)$(LIBPREF)$(NAME)_dll.lib $(SUBDIR)$(NAME).def;'
+             emximp -o $(SUBDIR)$(LIBPREF)$(NAME)_dll.lib $(SUBDIR)$(NAME).def;'
          SLIB_INSTALL_EXTRA_LIB='$(LIBPREF)$(NAME)_dll.a $(LIBPREF)$(NAME)_dll.lib'
          enable dos_paths
 +        enable_weak os2threads
          ;;
      gnu/kfreebsd)
          add_cppflags -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600 -D_BSD_SOURCE
@@@ -4303,15 -3794,11 +4300,15 @@@ Libs: -L\${libdir} -l${shortname} $(ena
  Libs.private: $(enabled shared && echo $libs)
  Cflags: -I\${includedir}
  EOF
 -    cat <<EOF > $name/$name-uninstalled.pc
 +
 +mkdir -p doc/examples/pc-uninstalled
 +includedir=${source_path}
 +[ "$includedir" = . ] && includedir="\${pcfiledir}/../../.."
- cat <<EOF > doc/examples/pc-uninstalled/$name.pc
++    cat <<EOF > doc/examples/pc-uninstalled/$name.pc
  prefix=
  exec_prefix=
 -libdir=\${pcfiledir}
 -includedir=${source_path}
 +libdir=\${pcfiledir}/../../../$name
 +includedir=${includedir}
  
  Name: $name
  Description: $comment
diff --cc ffserver.c
Simple merge
Simple merge