Merge branch 'codec'

Conflicts:
	Makefile.target
	qemu_configure.sh

diff --cc Makefile.target
index 1c53043,0bfcc53..b04d3e1
--- 1/Makefile.target
--- 2/Makefile.target
+++ b/Makefile.target
@@@ -235,12 -236,12 +236,17 @@@ obj-i386-y += helper_opengl.o opengl_ex
  obj-i386-y += svibe.o
  ##########################################################
  
- 
 +##########################################################
 +# general purpose interface for i386 
 +obj-i386-y += helper_gpi.o
 +##########################################################
 +
+ ifdef CONFIG_FFMPEG
+ # codec acceleration
+ obj-i386-y += codec_accel.o
+ LIBS+=-lavformat -lavcodec -lavutil -lswscale -lbz2
+ CFLAGS+=$(FFMPEG_CFLAGS)
+ endif
  
  # shared objects
  obj-ppc-y = ppc.o

diff --cc configure
Simple merge

diff --cc console.h
Simple merge

diff --cc hw/brightness.c
index b45c3dd,22c74bd..4008681
mode 100755,100644..100644
--- 1/hw/brightness.c
--- 2/hw/brightness.c
+++ b/hw/brightness.c

diff --cc hw/pc.c
index 07b4c51,94004e9..07b4c51
mode 100755,100644..100644
--- 1/hw/pc.c
--- 2/hw/pc.c
+++ b/hw/pc.c

diff --cc hw/pc.h
Simple merge

diff --cc hw/svcamera_pci.c
Simple merge

diff --cc qemu_configure.sh
index dcd63dd,f6d7c9c..5039833
--- 1/qemu_configure.sh
--- 2/qemu_configure.sh
+++ b/qemu_configure.sh
@@@ -9,13 -9,13 +9,14 @@@ exec ./configure 
   --target-list=i386-softmmu \
   --disable-werror \
   --audio-drv-list=pa \
 - --audio-card-list=es1370 \
   --enable-mixemu \
   --disable-vnc-tls \
-  --extra-ldflags="-lv4l2 -lv4lconvert"
- #    --enable-debug \
- #--enable-profiler \
 + --enable-tcg-x86-opt \
 -# --enable-gles2 --gles2dir=/usr \
+  --extra-ldflags="-lv4l2 -lv4lconvert -Xlinker -rpath -Xlinker ./lib"
+ # --enable-ffmpeg \
++# --enable-debug \
+ # --enable-profiler \
 +# --enable-gles2 --gles2dir=/usr
  ;;
  CYGWIN*)
  echo "checking for os... targetos $targetos"