repositories
/
deb_ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Debian version 2.5.0~trusty1.1
[deb_ffmpeg.git]
/
ffmpeg
/
libavformat
/
mpegenc.c
diff --git
a/ffmpeg/libavformat/mpegenc.c
b/ffmpeg/libavformat/mpegenc.c
index d3af9e1ea75c43ab8e642f980f77e3733c86b0c9..b1515064e86c7919c5730e993c835779667593ff 100644
(file)
--- a/
ffmpeg/libavformat/mpegenc.c
+++ b/
ffmpeg/libavformat/mpegenc.c
@@
-1080,8
+1080,10
@@
retry:
es_size -= stream->premux_packet->unwritten_size;
stream->premux_packet = stream->premux_packet->next;
}
es_size -= stream->premux_packet->unwritten_size;
stream->premux_packet = stream->premux_packet->next;
}
- if (es_size)
+ if (es_size) {
+ av_assert0(stream->premux_packet);
stream->premux_packet->unwritten_size -= es_size;
stream->premux_packet->unwritten_size -= es_size;
+ }
if (remove_decoded_packets(ctx, s->last_scr) < 0)
return -1;
if (remove_decoded_packets(ctx, s->last_scr) < 0)
return -1;