avconv: fix segfault at EOF with delayed pictures

At EOF it makes no sense to modify avpkt.{data,size} in output_packet
since no data is consumed. Frame threading with more than 1 threads
hits the segfault.
pull/2/head
Janne Grunau 13 years ago
parent c1848c4b26
commit aa38cff2c6
  1. 7
      avconv.c

@ -1892,8 +1892,11 @@ static int output_packet(InputStream *ist,
if (ret < 0)
return ret;
avpkt.data += ret;
avpkt.size -= ret;
// touch data and size only if not EOF
if (pkt) {
avpkt.data += ret;
avpkt.size -= ret;
}
if (!got_output) {
continue;
}

Loading…
Cancel
Save