diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 17:42:20 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 17:42:20 +0300 |
| commit | 4785c2617ee9ac186464a55c1bfb13a5781ef041 (patch) | |
| tree | 2424f18b68b2037bd4e290471821e9adae28b876 /stream | |
| parent | 2732d5efbae3e0ee28bc6b70ceab1eb77e593216 (diff) | |
| parent | 38abe6ff7a3810f8e01b6296570e92df1b12b09c (diff) | |
| download | mpv-4785c2617ee9ac186464a55c1bfb13a5781ef041.tar.bz2 mpv-4785c2617ee9ac186464a55c1bfb13a5781ef041.tar.xz | |
Merge svn changes up to r30967
Diffstat (limited to 'stream')
| -rw-r--r-- | stream/network.c | 5 | ||||
| -rw-r--r-- | stream/stream_dvb.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/stream/network.c b/stream/network.c index 537555f73a..a7528af4ad 100644 --- a/stream/network.c +++ b/stream/network.c @@ -298,7 +298,10 @@ http_read_response( int fd ) { } http_response_append( http_hdr, response, i ); } while( !http_is_header_entire( http_hdr ) ); - http_response_parse( http_hdr ); + if (http_response_parse( http_hdr ) < 0) { + http_free( http_hdr ); + return NULL; + } return http_hdr; } diff --git a/stream/stream_dvb.c b/stream/stream_dvb.c index f7ef473eed..c2e34d3d35 100644 --- a/stream/stream_dvb.c +++ b/stream/stream_dvb.c @@ -43,7 +43,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #include "libmpdemux/demuxer.h" #include "m_option.h" #include "m_struct.h" -#include "get_path.h" +#include "path.h" #include "libavutil/avstring.h" #include "dvbin.h" |