videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

Merge commit '4dfbc7a7559ccab666a8fd39de4224eb4b02c768' 

* commit '4dfbc7a7559ccab666a8fd39de4224eb4b02c768':
  msnwc_tcp: Correctly report failure

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2015-11-10 17:54:06 +01:00
parent 8600fef123 4dfbc7a755
commit 2e82d51714
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/msnwc_tcp.c
View File

@ -104,6 +104,7 @@ static int msnwc_tcp_read_packet(AVFormatContext *ctx, AVPacket *pkt)
AVIOContext *pb = ctx->pb;
uint16_t keyframe;
uint32_t size, timestamp;
int ret;
avio_skip(pb, 1); /* one byte has been read ahead */
avio_skip(pb, 2);
@ -114,8 +115,11 @@ static int msnwc_tcp_read_packet(AVFormatContext *ctx, AVPacket *pkt)
avio_skip(pb, 4);
timestamp = avio_rl32(pb);
if(!size || av_get_packet(pb, pkt, size) != size)
return -1;
if (!size)
return AVERROR_INVALIDDATA;
if ((ret = av_get_packet(pb, pkt, size)) < 0)
return ret;
avio_skip(pb, 1); /* Read ahead one byte of struct size like read_header */