* qatar/master: avpacket: Fix error checking in packet_alloc Conflicts: libavcodec/avpacket.c See: b905a7137a Merged-by: Michael Niedermayer <michaelni@gmx.at>
b905a7137a