aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorArt Clarke <aclarke@vlideshow.com>2008-06-20 07:27:44 +0000
committerBenoit Fouet <benoit.fouet@free.fr>2008-06-20 07:27:44 +0000
commit6919e54c00b750cd3d9d756258d3677df52f96a9 (patch)
tree1f2b68c01fcb3029728e7c433d2886b22cf7b6f6 /libavformat
parent9b64a036c0bcdbea33d6a253066312ef6c3304fe (diff)
downloadffmpeg-6919e54c00b750cd3d9d756258d3677df52f96a9.tar.gz
Check if there is at least a stream before writing trailer.
Patch by Art Clarke: aclarke vlideshow com Originally committed as revision 13836 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/utils.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 0f02ccf87b..e8cd86bcbc 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -2551,7 +2551,7 @@ int av_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out, AVPacket *pk
pktl= pktl->next;
}
- if(s->nb_streams == stream_count || (flush && stream_count)){
+ if(stream_count && (s->nb_streams == stream_count || flush)){
pktl= s->packet_buffer;
*out= pktl->pkt;