Browse Source

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.
tags/n0.9
Janne Grunau 14 years ago
parent
commit
aa38cff2c6
1 changed files with 5 additions and 2 deletions
  1. +5
    -2
      avconv.c

+ 5
- 2
avconv.c View File

@@ -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