Commit 7d8c21af authored by Jean-Paul Saman's avatar Jean-Paul Saman

Fix: Quicktime 404 error on RTSP SETUP. Patch by Brian Raymon <braymon _at_ echostrom _dot_ net>.

parent f32b795e
...@@ -29,6 +29,7 @@ Benoit Steiner <benny at via.ecp.fr> - MPEG system input, network input ...@@ -29,6 +29,7 @@ Benoit Steiner <benny at via.ecp.fr> - MPEG system input, network input
Bill Eldridge <bill at rfa.org> - documentation Bill Eldridge <bill at rfa.org> - documentation
Bob Maguire <maguirer at rjmaguire dot com> - addition of some controls to the OSX interface Bob Maguire <maguirer at rjmaguire dot com> - addition of some controls to the OSX interface
Brian Robb <vascy at hotmail dot com> - win32 CD/DVD drive detection in wx, bug fixes Brian Robb <vascy at hotmail dot com> - win32 CD/DVD drive detection in wx, bug fixes
Brian Raymond <braymond at echostorm dot net> - Quicktime 404 error on RTSP SETUP fix
Brieuc Jeunhomme <bbp at via.ecp.fr> - bug fixes Brieuc Jeunhomme <bbp at via.ecp.fr> - bug fixes
Bruno Vella <allevb at tin.it> - Italian localization Bruno Vella <allevb at tin.it> - Italian localization
Carlo Calabrò <murray at via.ecp.fr> - Italian localization Carlo Calabrò <murray at via.ecp.fr> - Italian localization
......
...@@ -24,6 +24,8 @@ ...@@ -24,6 +24,8 @@
/***************************************************************************** /*****************************************************************************
* Preamble * Preamble
*****************************************************************************/ *****************************************************************************/
#include "config.h"
#include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
# include <unistd.h> # include <unistd.h>
...@@ -1154,8 +1156,8 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) ...@@ -1154,8 +1156,8 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
{ {
uint8_t *p_buffer = p_fmt->p_extra; uint8_t *p_buffer = p_fmt->p_extra;
int i_buffer = p_fmt->i_extra; int i_buffer = p_fmt->i_extra;
char *p_64_sps; char *p_64_sps = NULL;
char *p_64_pps; char *p_64_pps = NULL;
char hexa[6]; char hexa[6];
while( i_buffer > 4 && while( i_buffer > 4 &&
...@@ -1729,7 +1731,7 @@ static int RtspCallback( httpd_callback_sys_t *p_args, ...@@ -1729,7 +1731,7 @@ static int RtspCallback( httpd_callback_sys_t *p_args,
answer->i_status = 200; answer->i_status = 200;
answer->psz_status = strdup( "OK" ); answer->psz_status = strdup( "OK" );
httpd_MsgAdd( answer, "Content-type", "%s", "application/sdp" ); httpd_MsgAdd( answer, "Content-type", "%s", "application/sdp" );
httpd_MsgAdd( answer, "Content-Base", "%s/", p_sys->psz_rtsp_control );
answer->p_body = (uint8_t *)psz_sdp; answer->p_body = (uint8_t *)psz_sdp;
answer->i_body = strlen( psz_sdp ); answer->i_body = strlen( psz_sdp );
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment