From 1edddc99dc247166fe7ca3ad85346a237cbe72d4 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Sat, 13 Dec 2008 21:40:20 +0000 Subject: Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c. Reason for this is that there are no shared entries in the demuxer/muxer context, making it a mystery as to why it was shared between the two. See "[PATCH] clean rmdemux/muxcontext" patch on mailinglist. Originally committed as revision 16111 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/rm.h | 39 --------------------------------------- 1 file changed, 39 deletions(-) (limited to 'libavformat/rm.h') diff --git a/libavformat/rm.h b/libavformat/rm.h index eff271fd2a..5bb6c06e30 100644 --- a/libavformat/rm.h +++ b/libavformat/rm.h @@ -24,45 +24,6 @@ #include "avformat.h" - -typedef struct { - int nb_packets; - int packet_total_size; - int packet_max_size; - /* codec related output */ - int bit_rate; - float frame_rate; - int nb_frames; /* current frame number */ - int total_frames; /* total number of frames */ - int num; - AVCodecContext *enc; -} StreamInfo; - -typedef struct { - StreamInfo streams[2]; - StreamInfo *audio_stream, *video_stream; - int data_pos; /* position of the data after the header */ - int nb_packets; - int old_format; - int current_stream; - int remaining_len; - uint8_t *videobuf; ///< place to store merged video frame - int videobufsize; ///< current assembled frame size - int videobufpos; ///< position for the next slice in the video buffer - int curpic_num; ///< picture number of current frame - int cur_slice, slices; - int64_t pktpos; ///< first slice position in file - /// Audio descrambling matrix parameters - uint8_t *audiobuf; ///< place to store reordered audio data - int64_t audiotimestamp; ///< Audio packet timestamp - int sub_packet_cnt; // Subpacket counter, used while reading - int sub_packet_size, sub_packet_h, coded_framesize; ///< Descrambling parameters from container - int audio_stream_num; ///< Stream number for audio packets - int audio_pkt_cnt; ///< Output packet counter - int audio_framesize; /// Audio frame size from container - int sub_packet_lengths[16]; /// Length of each aac subpacket -} RMContext; - /*< input format for Realmedia-style RTSP streams */ extern AVInputFormat rdt_demuxer; -- cgit v1.2.3