[FFmpeg-cvslog] rtpenc: Use AVFormatContext.packet_size instead of a private option

[Martin Storsjö]

ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Mon Mar 19 13:56:25 2012 +0200| [316e724f18c7299958d7f77c85c7425d43e7e777] | committer: Martin Storsjö

rtpenc: Use AVFormatContext.packet_size instead of a private option

The private option has not been part of any release yet (and
it is only of use in quite rare cases), so just remove it instead
of keeping it with deprecation warnings.

Signed-off-by: Martin Storsjö <martin at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=316e724f18c7299958d7f77c85c7425d43e7e777
---

 libavformat/rtpenc.c |   17 ++++++++---------
 libavformat/rtpenc.h |    1 -
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c
index 5df25e4..6a1be49 100644
--- a/libavformat/rtpenc.c
+++ b/libavformat/rtpenc.c
@@ -33,7 +33,6 @@
 static const AVOption options[] = {
     FF_RTP_FLAG_OPTS(RTPMuxContext, flags)
     { "payload_type", "Specify RTP payload type", offsetof(RTPMuxContext, payload_type), AV_OPT_TYPE_INT, {.dbl = -1 }, -1, 127, AV_OPT_FLAG_ENCODING_PARAM },
-    { "max_packet_size", "Max packet size", offsetof(RTPMuxContext, max_packet_size), AV_OPT_TYPE_INT, {.dbl = 0 }, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM },
     { NULL },
 };
 
@@ -110,21 +109,21 @@ static int rtp_write_header(AVFormatContext *s1)
         s->first_rtcp_ntp_time = (s1->start_time_realtime / 1000) * 1000 +
                                  NTP_OFFSET_US;
 
-    if (s->max_packet_size) {
+    if (s1->packet_size) {
         if (s1->pb->max_packet_size)
-            s->max_packet_size = FFMIN(s->max_packet_size,
-                                       s1->pb->max_packet_size);
+            s1->packet_size = FFMIN(s1->packet_size,
+                                    s1->pb->max_packet_size);
     } else
-        s->max_packet_size = s1->pb->max_packet_size;
-    if (s->max_packet_size <= 12) {
-        av_log(s1, AV_LOG_ERROR, "Max packet size %d too low\n", s->max_packet_size);
+        s1->packet_size = s1->pb->max_packet_size;
+    if (s1->packet_size <= 12) {
+        av_log(s1, AV_LOG_ERROR, "Max packet size %d too low\n", s1->packet_size);
         return AVERROR(EIO);
     }
-    s->buf = av_malloc(s->max_packet_size);
+    s->buf = av_malloc(s1->packet_size);
     if (s->buf == NULL) {
         return AVERROR(ENOMEM);
     }
-    s->max_payload_size = s->max_packet_size - 12;
+    s->max_payload_size = s1->packet_size - 12;
 
     s->max_frames_per_packet = 0;
     if (s1->max_delay) {
diff --git a/libavformat/rtpenc.h b/libavformat/rtpenc.h
index 322cee0..b8a3fd1 100644
--- a/libavformat/rtpenc.h
+++ b/libavformat/rtpenc.h
@@ -34,7 +34,6 @@ struct RTPMuxContext {
     uint32_t timestamp;
     uint32_t base_timestamp;
     uint32_t cur_timestamp;
-    int max_packet_size;
     int max_payload_size;
     int num_frames;