History

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.

Janne Grunau committed 14 years ago

Commit aa38cff1 parent c1848c41 file · +5 −2Browse files

Unified · Split

avconv.c+5−2
@@ -1892,8 +1892,11 @@ static int output_packet(InputStream *ist, · 1891 unmodified lines
18921892
18931893 if (ret < 0)
18941894 return ret;
1895− avpkt.data += ret;
1896− avpkt.size -= ret;
1895+ // touch data and size only if not EOF
1896+ if (pkt) {
1897+ avpkt.data += ret;
1898+ avpkt.size -= ret;
1899+ }
18971900 if (!got_output) {
18981901 continue;
18991902 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t