* qatar/master:
avpacket: Fix error checking in packet_alloc
Conflicts:
libavcodec/avpacket.c
See: b905a7137a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/36/head
commit
7283d2bb90
1 changed files with 4 additions and 3 deletions
Loading…
Reference in new issue