[FFmpeg-soc] [soc]: r5870 - in mms: mms.h mmsh.c
spyfeng
subversion at mplayerhq.hu
Tue Jul 27 17:30:35 CEST 2010
Author: spyfeng
Date: Tue Jul 27 17:30:35 2010
New Revision: 5870
Log:
move MMSHContext into mms.h for ready to extract common field with MMSContext.
Modified:
mms/mms.h
mms/mmsh.c
Modified: mms/mms.h
==============================================================================
--- mms/mms.h Tue Jul 27 17:06:25 2010 (r5869)
+++ mms/mms.h Tue Jul 27 17:30:35 2010 (r5870)
@@ -66,4 +66,27 @@ typedef struct {
int stream_num; ///< stream numbers.
int is_playing;
} MMSContext;
+
+typedef struct
+{
+ URLContext *mms_hd;
+ uint8_t out_buffer[8192]; ///< Buffer for outgoing packet.
+ uint8_t in_buffer[8192]; //TODO, maybe reused by out_buffer.
+ uint8_t *read_in_ptr;
+ MMSStream streams[MAX_STREAMS];
+
+ uint8_t *asf_header;
+ int asf_header_size;
+ int asf_header_read_size;
+ int asf_data_remaining_len;
+ int asf_packet_len;
+
+
+ char location[1024];
+ int seekable;
+ int stream_num;
+ int request_seq;
+ int chunk_seq;
+ int is_header_parsed;
+}MMSHContext;
#endif
Modified: mms/mmsh.c
==============================================================================
--- mms/mmsh.c Tue Jul 27 17:06:25 2010 (r5869)
+++ mms/mmsh.c Tue Jul 27 17:30:35 2010 (r5870)
@@ -18,7 +18,7 @@
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "avformat.h"
+#include "mms.h"
#include "internal.h"
#include "libavutil/intreadwrite.h"
#include <string.h>
@@ -68,33 +68,6 @@ static const char* mmsh_live_request =
"Pragma: stream-switch-entry=%s\r\n"
"Connection: Close\r\n\r\n";
-typedef struct {
- int id;
-}MMSStream;
-
-typedef struct
-{
- URLContext *mms_hd;
- uint8_t out_buffer[8192]; ///< Buffer for outgoing packet.
- uint8_t in_buffer[8192]; //TODO, maybe reused by out_buffer.
- uint8_t *read_in_ptr;
- MMSStream streams[MAX_STREAMS];
-
- uint8_t *asf_header;
- int asf_header_size;
- int asf_header_read_size;
- int asf_data_remaining_len;
- int asf_packet_len;
-
-
- char location[1024];
- int seekable;
- int stream_num;
- int request_seq;
- int chunk_seq;
- int is_header_parsed;
-}MMSHContext;
-
static int mmsh_close(URLContext *h)
{
MMSHContext *mms = (MMSHContext *)h->priv_data;
More information about the FFmpeg-soc
mailing list