Merge commit '2326558d5277ec87ba6d607a01ec6acfc51c694c'

* commit '2326558d5277ec87ba6d607a01ec6acfc51c694c':
  rtpdec: Split mpegts parsing to a normal depacketizer
  rtpdec: Reorder payload handler registration alphabetically

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 0 insertions, 6 deletions

diff --git a/libavformat/rtpdec.h b/libavformat/rtpdec.h
index 0c5dcabc8b..e469c0f61c 100644
--- a/libavformat/rtpdec.h
+++ b/libavformat/rtpdec.h
@@ -160,9 +160,6 @@ struct RTPDemuxContext {
     int64_t  unwrapped_timestamp;
     int64_t  range_start_offset;
     int max_payload_size;
-    struct MpegTSContext *ts;   /* only used for MP2T payloads */
-    int read_buf_index;
-    int read_buf_size;
     /* used to send back RTCP RR */
     char hostname[256];
 
@@ -192,9 +189,6 @@ struct RTPDemuxContext {
     unsigned int last_octet_count;
     int64_t last_feedback_time;
 
-    /* buffer for partially parsed packets */
-    uint8_t buf[RTP_MAX_PACKET_LENGTH];
-
     /* dynamic payload stuff */
     const RTPDynamicProtocolHandler *handler;
     PayloadContext *dynamic_protocol_context;