Changeset 7283d2bb in ffmpeg

Timestamp:

Sep 16, 2013, 12:22:26 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

fcea6f71

Parents:

b3970b3 (diff), 85e8192b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (09/16/13 12:21:47)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (09/16/13 12:22:26)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: avpacket: Fix error checking in packet_alloc

Conflicts:

libavcodec/avpacket.c

See: b905a7137a51a9a4f66d75172897d1f38c0b292a
Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)