[SCM] libav/experimental: Remove an unneeded local variable.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:56:28 UTC 2013


The following commit has been merged in the experimental branch:
commit b3fbe02c868ab2f545c9153037fec3f81c82ca88
Author: Luca Abeni <lucabe72 at email.it>
Date:   Mon Dec 28 13:19:54 2009 +0000

    Remove an unneeded local variable.
    
    Originally committed as revision 20944 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c
index 91b9c05..e522b1a 100644
--- a/libavformat/rtpenc.c
+++ b/libavformat/rtpenc.c
@@ -71,7 +71,7 @@ static int is_supported(enum CodecID id)
 static int rtp_write_header(AVFormatContext *s1)
 {
     RTPMuxContext *s = s1->priv_data;
-    int payload_type, max_packet_size, n;
+    int max_packet_size, n;
     AVStream *st;
 
     if (s1->nb_streams != 1)
@@ -83,10 +83,9 @@ static int rtp_write_header(AVFormatContext *s1)
         return -1;
     }
 
-    payload_type = ff_rtp_get_payload_type(st->codec);
-    if (payload_type < 0)
-        payload_type = RTP_PT_PRIVATE + (st->codec->codec_type == CODEC_TYPE_AUDIO);
-    s->payload_type = payload_type;
+    s->payload_type = ff_rtp_get_payload_type(st->codec);
+    if (s->payload_type < 0)
+        s->payload_type = RTP_PT_PRIVATE + (st->codec->codec_type == CODEC_TYPE_AUDIO);
 
 // following 2 FIXMEs could be set based on the current time, there is normally no info leak, as RTP will likely be transmitted immediately
     s->base_timestamp = 0; /* FIXME: was random(), what should this be? */

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list