Use new ffmpeg revision

Original commit message from CVS:
Use new ffmpeg revision

diff --git a/common b/common
index ed42933..9a3a505 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit ed429334bba35b10172ba97d9b3795b75a65b388
+Subproject commit 9a3a505fcc52865de0bedbb3ee1ce0a6dcc9a025

diff --git a/ext/ffmpeg/gstffmpegallcodecmap.c b/ext/ffmpeg/gstffmpegallcodecmap.c
index e1d02a8..fad6cb3 100644 (file)
--- a/ext/ffmpeg/gstffmpegallcodecmap.c
+++ b/ext/ffmpeg/gstffmpegallcodecmap.c
@@ -159,12 +159,7 @@ gst_ffmpeg_codecid_to_caps (enum CodecID    codec_id,
             break;
           case PIX_FMT_RGBA32:
             bpp = depth = 32;
-            endianness = G_BIG_ENDIAN;
-            r_mask = 0x00ff0000; g_mask = 0x0000ff00; b_mask = 0x000000ff;
-            break;
-          case PIX_FMT_BGRA32:
-            bpp = depth = 32;
-            endianness = G_BIG_ENDIAN;
+            endianness = G_BYTE_ORDER;
             r_mask = 0x00ff0000; g_mask = 0x0000ff00; b_mask = 0x000000ff;
             break;
           case PIX_FMT_YUV410P:
@@ -175,22 +170,12 @@ gst_ffmpeg_codecid_to_caps (enum CodecID    codec_id,
             break;
           case PIX_FMT_RGB565:
             bpp = depth = 16;
-            endianness = G_BIG_ENDIAN;
+            endianness = G_BYTE_ORDER;
             r_mask = 0xf800; g_mask = 0x07e0; b_mask = 0x001f;
             break;
           case PIX_FMT_RGB555:
             bpp = 16; depth = 15;
-            endianness = G_BIG_ENDIAN;
-            r_mask = 0x7c00; g_mask = 0x03e0; b_mask = 0x001f;
-            break;
-          case PIX_FMT_BGR565:
-            bpp = depth = 16;
-            endianness = G_LITTLE_ENDIAN;
-            r_mask = 0xf800; g_mask = 0x07e0; b_mask = 0x001f;
-            break;
-          case PIX_FMT_BGR555:
-            bpp = 16; depth = 16;
-            endianness = G_LITTLE_ENDIAN;
+            endianness = G_BYTE_ORDER;
             r_mask = 0x7c00; g_mask = 0x03e0; b_mask = 0x001f;
             break;
           default:
@@ -562,18 +547,10 @@ gst_ffmpeg_caps_to_codecid (GstCaps        *caps,
           gst_caps_get_int(caps, "depth", &depth);
           switch (depth) {
             case 15:
-              if (endianness == G_BIG_ENDIAN) {
-                context->pix_fmt = PIX_FMT_RGB555;
-              } else {
-                context->pix_fmt = PIX_FMT_BGR555;
-              }
+              context->pix_fmt = PIX_FMT_RGB555;
               break;
             case 16:
-              if (endianness == G_BIG_ENDIAN) {
-                context->pix_fmt = PIX_FMT_RGB565;
-              } else {
-                context->pix_fmt = PIX_FMT_BGR565;
-              }
+              context->pix_fmt = PIX_FMT_RGB565;
               break;
             case 24:
               if (endianness == G_BIG_ENDIAN) {
@@ -583,11 +560,7 @@ gst_ffmpeg_caps_to_codecid (GstCaps        *caps,
               }
               break;
             case 32:
-              if (endianness == G_BIG_ENDIAN) {
-                context->pix_fmt = PIX_FMT_RGBA32;
-              } else {
-                context->pix_fmt = PIX_FMT_BGRA32;
-              }
+              context->pix_fmt = PIX_FMT_RGBA32;
               break;
           }
           break;

diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c
index 2d4f1ab..9ad715c 100644 (file)
--- a/ext/ffmpeg/gstffmpegcodecmap.c
+++ b/ext/ffmpeg/gstffmpegcodecmap.c
@@ -87,7 +87,7 @@ gst_ffmpegcodec_codec_context_to_caps (AVCodecContext *context, int codec_id)
         return GST_CAPS_NEW ("ffmpeg_mpeg4",
                             "video/avi",
                               "format",  GST_PROPS_STRING ("strf_vids"),
-                               "compression",  GST_PROPS_FOURCC (context->fourcc),
+                               "compression",  GST_PROPS_FOURCC (context->codec_tag),
                                "width",   GST_PROPS_INT (context->width),
                                "height",  GST_PROPS_INT (context->height)
                            );

diff --git a/ext/ffmpeg/gstffmpegenc.c b/ext/ffmpeg/gstffmpegenc.c
index f2237b4..6cc7a1d 100644 (file)
--- a/ext/ffmpeg/gstffmpegenc.c
+++ b/ext/ffmpeg/gstffmpegenc.c
@@ -297,7 +297,8 @@ gst_ffmpegenc_init(GstFFMpegEnc *ffmpegenc)
     ffmpegenc->context->qmax = 15;
     ffmpegenc->context->max_qdiff = 3;
     ffmpegenc->context->gop_size = 15;
-    ffmpegenc->context->frame_rate = 25 * FRAME_RATE_BASE;
+    ffmpegenc->context->frame_rate = 25 * DEFAULT_FRAME_RATE_BASE;
+    ffmpegenc->context->frame_rate_base = DEFAULT_FRAME_RATE_BASE;
     ffmpegenc->out_width = -1;
     ffmpegenc->out_height = -1;
   }

diff --git a/ext/ffmpeg/gstffmpegmux.c b/ext/ffmpeg/gstffmpegmux.c
index 3e4ee88..45ee7b9 100644 (file)
--- a/ext/ffmpeg/gstffmpegmux.c
+++ b/ext/ffmpeg/gstffmpegmux.c
@@ -172,7 +172,8 @@ gst_ffmpegmux_sinkconnect (GstPad *pad, GstCaps *caps)
     gst_caps_get_int (caps, "height", &ffmpegmux->context->height);
 
   ffmpegmux->context->pix_fmt = PIX_FMT_YUV420P;
-  ffmpegmux->context->frame_rate = 23 * FRAME_RATE_BASE;
+  ffmpegmux->context->frame_rate = 23 * DEFAULT_FRAME_RATE_BASE;
+  ffmpegmux->context->frame_rate_base = DEFAULT_FRAME_RATE_BASE;
   ffmpegmux->context->bit_rate = 0;
 
   /* FIXME bug in ffmpeg */