ext/ffmpeg/gstffmpegenc.c: If we are not operating in RTP mode, leave the default...

Original commit message from CVS:
Patch by: Mark Nauwelaerts <manauw at skynet dot be>
* ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_setcaps):
If we are not operating in RTP mode, leave the default rtp encoder
settings as they are so that we don't unintentionally activate it.
Fixes #351415.

diff --git a/ChangeLog b/ChangeLog
index cdd685c..566a660 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-08-16  Wim Taymans  <wim@fluendo.com>
+
+       Patch by: Mark Nauwelaerts <manauw at skynet dot be>
+
+       * ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_setcaps):
+       If we are not operating in RTP mode, leave the default rtp encoder
+       settings as they are so that we don't unintentionally activate it.
+       Fixes #351415.
+
+
 2006-08-14  Edward Hervey  <edward@fluendo.com>
 
        * configure.ac:

diff --git a/ext/ffmpeg/gstffmpegenc.c b/ext/ffmpeg/gstffmpegenc.c
index 890ddc4..0a16c38 100644 (file)
--- a/ext/ffmpeg/gstffmpegenc.c
+++ b/ext/ffmpeg/gstffmpegenc.c
@@ -409,9 +409,6 @@ gst_ffmpegenc_setcaps (GstPad * pad, GstCaps * caps)
   if (ffmpegenc->rtp_payload_size) {
     ffmpegenc->context->rtp_mode = 1;
     ffmpegenc->context->rtp_payload_size = ffmpegenc->rtp_payload_size;
-  } else {
-    ffmpegenc->context->rtp_mode = 0;
-    ffmpegenc->context->rtp_payload_size = 512;
   }
 
   /* general properties */