Merge remote-tracking branch 'x264/master'
authorPhillip Blucas <pblucas@gmail.com>
Sat, 4 Feb 2012 22:24:43 +0000 (16:24 -0600)
committerPhillip Blucas <pblucas@gmail.com>
Sat, 4 Feb 2012 22:24:43 +0000 (16:24 -0600)
Conflicts:
Makefile
configure

39 files changed:
1  2 
Makefile
common/arm/quant-a.S
common/arm/quant.h
common/bitstream.c
common/bitstream.h
common/cabac.c
common/common.c
common/common.h
common/dct.c
common/dct.h
common/frame.c
common/frame.h
common/macroblock.c
common/mc.c
common/mc.h
common/mvpred.c
common/predict.c
common/predict.h
common/quant.c
common/quant.h
common/set.c
common/set.h
common/x86/predict-a.asm
common/x86/predict.h
common/x86/quant-a.asm
configure
encoder/analyse.c
encoder/encoder.c
encoder/macroblock.c
encoder/macroblock.h
encoder/me.c
encoder/ratecontrol.c
encoder/rdo.c
encoder/set.c
encoder/set.h
encoder/slicetype.c
tools/checkasm.c
x264.c
x264.h

diff --cc Makefile
+++ b/Makefile
@@@ -6,11 -6,11 +6,13 @@@ vpath %.c $(SRCPATH
  vpath %.h $(SRCPATH)
  vpath %.S $(SRCPATH)
  vpath %.asm $(SRCPATH)
+ vpath %.rc $(SRCPATH)
  
  all: default
+ default:
  
 +CLIS = x264$(EXE)
 +
  SRCS = common/mc.c common/predict.c common/pixel.c common/macroblock.c \
         common/frame.c common/dct.c common/cpu.c common/cabac.c \
         common/common.c common/osdep.c common/rectangle.c \
@@@ -151,9 -151,7 +158,7 @@@ OBJSO  += $(SRCSO:%.c=%.o
  
  .PHONY: all default fprofiled clean distclean install uninstall lib-static lib-shared cli install-lib-dev install-lib-static install-lib-shared install-cli
  
- default: $(DEP)
 -cli: x264$(EXE)
 +cli: $(CLIS)
  lib-static: $(LIBX264)
  lib-shared: $(SONAME)
  
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc common/cabac.c
Simple merge
diff --cc common/common.c
Simple merge
diff --cc common/common.h
Simple merge
diff --cc common/dct.c
Simple merge
diff --cc common/dct.h
Simple merge
diff --cc common/frame.c
Simple merge
diff --cc common/frame.h
Simple merge
Simple merge
diff --cc common/mc.c
Simple merge
diff --cc common/mc.h
Simple merge
diff --cc common/mvpred.c
Simple merge
Simple merge
Simple merge
diff --cc common/quant.c
Simple merge
diff --cc common/quant.h
Simple merge
diff --cc common/set.c
Simple merge
diff --cc common/set.h
Simple merge
Simple merge
Simple merge
@@@ -1371,9 -1364,9 +1364,9 @@@ cglobal coeff_level_run%1,0,
      mov   [t1], t4d
  .loop:
      LZCOUNT t3d, t5d, 0x1f
- %ifdef HIGH_BIT_DEPTH
+ %if HIGH_BIT_DEPTH
      mov    t2d, [t0+t4*4]
 -    mov   [t1+t6+8+16*4], t3b
 +    mov   [t1+t6+8+64*4], t3b
      mov   [t1+t6*4+ 8], t2d
  %else
      mov    t2w, [t0+t4*2]
diff --cc configure
index 05206c0,db7ad0e..0f1c651
mode 100755,100755..100644
+++ b/configure
@@@ -935,8 -958,9 +965,10 @@@ f
  
  if [ "$bit_depth" -gt "8" ]; then
      define HIGH_BIT_DEPTH
-     ASFLAGS="$ASFLAGS -DHIGH_BIT_DEPTH"
+     ASFLAGS="$ASFLAGS -DHIGH_BIT_DEPTH=1"
 +    mpeg2="no"
+ else
+     ASFLAGS="$ASFLAGS -DHIGH_BIT_DEPTH=0"
  fi
  
  if [ "$chroma_format" != "all" ]; then
@@@ -1036,9 -1053,9 +1068,10 @@@ RANLIB=$RANLI
  STRIP=$STRIP
  AS=$AS
  ASFLAGS=$ASFLAGS
+ RC=$RC
  EXE=$EXE
  HAVE_GETOPT_LONG=$HAVE_GETOPT_LONG
 +HAVE_MPEG2=$x264_mpeg2
  DEVNULL=$DEVNULL
  PROF_GEN_CC=$PROF_GEN_CC
  PROF_GEN_LD=$PROF_GEN_LD
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc encoder/me.c
Simple merge
Simple merge
diff --cc encoder/rdo.c
Simple merge
diff --cc encoder/set.c
@@@ -635,11 -575,11 +635,11 @@@ int x264_sei_version_write( x264_t *h, 
  
      memcpy( payload, uuid, 16 );
      sprintf( payload+16, "x264 - core %d%s - H.264/MPEG-4 AVC codec - "
-              "Copy%s 2003-2011 - http://www.videolan.org/x264.html - options: %s",
+              "Copy%s 2003-2012 - http://www.videolan.org/x264.html - options: %s",
               X264_BUILD, X264_VERSION, HAVE_GPL?"left":"right", opts );
      length = strlen(payload)+1;
 -
 -    x264_sei_write( s, (uint8_t *)payload, length, SEI_USER_DATA_UNREGISTERED );
 +    MPEG2 ? x264_user_data_write_mpeg2( s, (uint8_t *)payload, length ) :
 +            x264_sei_write( s, (uint8_t *)payload, length, SEI_USER_DATA_UNREGISTERED );
  
      x264_free( opts );
      x264_free( payload );
diff --cc encoder/set.h
Simple merge
Simple merge
Simple merge
diff --cc x264.c
Simple merge
diff --cc x264.h
Simple merge