rtspenc: Check the return value from ffio_open_dyn_packet_buf

[ffmpeg] / libavformat / rtpenc.h

diff --git a/libavformat/rtpenc.h b/libavformat/rtpenc.h
index 5351b4590c973eec27680996304dfea2f907e18a..9d7340d0cd7edd04c0c7239d46475ea5dbdac885 100644 (file)
--- a/libavformat/rtpenc.h
+++ b/libavformat/rtpenc.h
@@ -30,21 +30,20 @@ struct RTPMuxContext {
     AVStream *st;
     int payload_type;
     uint32_t ssrc;
-    uint16_t seq;
+    const char *cname;
+    int seq;
     uint32_t timestamp;
     uint32_t base_timestamp;
     uint32_t cur_timestamp;
     int max_payload_size;
     int num_frames;
 
-    /* rtcp sender statistics receive */
-    int64_t last_rtcp_ntp_time;    // TODO: move into statistics
-    int64_t first_rtcp_ntp_time;   // TODO: move into statistics
-
     /* rtcp sender statistics */
-    unsigned int packet_count;     // TODO: move into statistics (outgoing)
-    unsigned int octet_count;      // TODO: move into statistics (outgoing)
-    unsigned int last_octet_count; // TODO: move into statistics (outgoing)
+    int64_t last_rtcp_ntp_time;
+    int64_t first_rtcp_ntp_time;
+    unsigned int packet_count;
+    unsigned int octet_count;
+    unsigned int last_octet_count;
     int first_packet;
     /* buffer for output */
     uint8_t *buf;
@@ -59,6 +58,8 @@ struct RTPMuxContext {
     int nal_length_size;
 
     int flags;
+
+    unsigned int frame_count;
 };
 
 typedef struct RTPMuxContext RTPMuxContext;