Changeset 62aec0c2 in ffmpeg

Timestamp:

Feb 17, 2015, 9:47:36 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

38e867f6

Parents:

7a7b77e6 (diff), fe0f4e56 (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> (02/17/15 21:46:59)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (02/17/15 21:47:36)

Message:

Merge commit 'fe0f4e56577a2dbd373bb50b0ae2d49e69d822fc'

• commit 'fe0f4e56577a2dbd373bb50b0ae2d49e69d822fc': avpacket: Check buffer reference

Conflicts:

libavcodec/avpacket.c

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

(No files)