diff -uNrp ./ffmpeg/Makefile ../../dg/src/ffmpeg/Makefile
--- 1/ffmpeg/Makefile	Thu Dec  4 19:34:11 2008
+++ 2/ffmpeg/Makefile	Wed Aug  6 20:55:34 2008
@@ -1,3 +1,4 @@
+CC=gcc
 LAVC_DIR=libavcodec
 LAVU_DIR=libavutil
 ZLIB_DIR=../zlib
diff -uNrp ./ffmpeg/libavcodec/h264.c ../../dg/src/ffmpeg/libavcodec/h264.c
--- 1/ffmpeg/libavcodec/h264.c	Thu Dec  4 19:53:02 2008
+++ 2/ffmpeg/libavcodec/h264.c	Wed Aug  6 20:45:04 2008
@@ -7166,7 +7166,7 @@ static inline int decode_vui_parameters(
         if( aspect_ratio_idc == EXTENDED_SAR ) {
             sps->sar.num= get_bits(&s->gb, 16);
             sps->sar.den= get_bits(&s->gb, 16);
-        }else if(aspect_ratio_idc < 14){
+        }else if(aspect_ratio_idc < sizeof(pixel_aspect)/sizeof(*pixel_aspect)){
             sps->sar=  pixel_aspect[aspect_ratio_idc];
         }else{
             av_log(h->s.avctx, AV_LOG_ERROR, "illegal aspect ratio\n");
@@ -7824,6 +7824,7 @@ static int decode_frame(AVCodecContext *
 
         if(out){
             *data_size = sizeof(AVFrame);
+            out->opaque = (void *) out->poc;
             *pict= *(AVFrame*)out;
         }
 
@@ -8012,7 +8013,10 @@ static int decode_frame(AVCodecContext *
 #endif
 
             if(out)
+            {
+                out->opaque = (void *) out->poc;
                 *pict= *(AVFrame*)out;
+            }
             else
                 av_log(avctx, AV_LOG_DEBUG, "no picture\n");
         }
diff -uNrp ./ffmpeg/libavcodec/h264data.h ../../dg/src/ffmpeg/libavcodec/h264data.h
--- 1/ffmpeg/libavcodec/h264data.h	Thu Dec  4 19:33:59 2008
+++ 2/ffmpeg/libavcodec/h264data.h	Wed Aug  6 20:44:08 2008
@@ -56,7 +56,7 @@ NAL_SPS_EXT,
 NAL_AUXILIARY_SLICE=19
 };
 
-static const AVRational pixel_aspect[14]={
+static const AVRational pixel_aspect[17]={
  {0, 1},
  {1, 1},
  {12, 11},
@@ -71,6 +71,9 @@ static const AVRational pixel_aspect[14]
  {15, 11},
  {64, 33},
  {160,99},
+ {4, 3},
+ {3, 2},
+ {2, 1},
 };
 
 static const uint8_t golomb_to_pict_type[5]=
diff -uNrp ./ffmpeg/libavcodec.def ../../dg/src/ffmpeg/libavcodec.def
--- 1/ffmpeg/libavcodec.def	Thu Dec  4 19:34:11 2008
+++ 2/ffmpeg/libavcodec.def	Tue Feb 19 21:10:56 2008
@@ -13,6 +13,7 @@ EXPORTS
   avcodec_flush_buffers
   avcodec_close
   getVersion
+  av_getVersion
   av_free_static
   av_free
 
diff -uNrp ./ffmpeg/libavcodec_dec.def ../../dg/src/ffmpeg/libavcodec_dec.def
--- 1/ffmpeg/libavcodec_dec.def	Thu Dec  4 19:34:11 2008
+++ 2/ffmpeg/libavcodec_dec.def	Tue Feb 19 21:10:40 2008
@@ -10,6 +10,7 @@ EXPORTS
   avcodec_flush_buffers
   avcodec_close
   getVersion
+  av_getVersion
   av_free_static
   av_free
 
diff -uNrp ./ffmpeg/libavutil/avutil.h ../../dg/src/ffmpeg/libavutil/avutil.h
--- 1/ffmpeg/libavutil/avutil.h	Thu Dec  4 19:33:38 2008
+++ 2/ffmpeg/libavutil/avutil.h	Tue Feb 19 20:53:34 2008
@@ -31,7 +31,7 @@
 #define AV_TOSTRING(s) #s
 
 #define LIBAVUTIL_VERSION_INT   ((49<<16)+(5<<8)+0)
-#define LIBAVUTIL_VERSION       49.5.0
+#define LIBAVUTIL_VERSION       49.5.0DG2
 #define LIBAVUTIL_BUILD         LIBAVUTIL_VERSION_INT
 
 #define LIBAVUTIL_IDENT         "Lavu" AV_STRINGIFY(LIBAVUTIL_VERSION)
diff -uNrp ./ffmpeg/libavutil/log.c ../../dg/src/ffmpeg/libavutil/log.c
--- 1/ffmpeg/libavutil/log.c	Thu Dec  4 19:33:38 2008
+++ 2/ffmpeg/libavutil/log.c	Tue Feb 19 20:54:08 2008
@@ -79,3 +79,8 @@ void* av_log_get_callback(void)
 {
     return av_log_callback;
 }
+
+void av_getVersion(char *version_str)
+{
+	strcpy(version_str, AV_STRINGIFY(LIBAVUTIL_VERSION));
+}
\ No newline at end of file