xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-24 12:09:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

avconv: fix segfault at EOF with delayed pictures

Browse Source 
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.
This commit is contained in:
Janne Grunau 2011-11-24 00:18:33 +01:00
parent c1848c4b26
commit aa38cff2c6
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
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;
}