RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavf/segment: simplify logic and fix !=0 check on segment_end return value 

A successfull return value can be > 0.
This commit is contained in:
Stefano Sabatini 2013-10-15 15:17:22 +02:00
parent 67e507e10e
commit 1120fd7852
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/segment.c
View File

@ -663,12 +663,10 @@ static int seg_write_packet(AVFormatContext *s, AVPacket *pkt)
(pkt->pts != AV_NOPTS_VALUE && (pkt->pts != AV_NOPTS_VALUE &&
av_compare_ts(pkt->pts, st->time_base, av_compare_ts(pkt->pts, st->time_base,
end_pts-seg->time_delta, AV_TIME_BASE_Q) >= 0))) { end_pts-seg->time_delta, AV_TIME_BASE_Q) >= 0))) {
ret = segment_end(s, seg->individual_header_trailer, 0); if ((ret = segment_end(s, seg->individual_header_trailer, 0)) < 0)
goto fail;
if (!ret) if ((ret = segment_start(s, seg->individual_header_trailer)) < 0)
ret = segment_start(s, seg->individual_header_trailer);
if (ret)
goto fail; goto fail;
oc = seg->avf; oc = seg->avf;