Changeset 38e867f6 in ffmpeg

Timestamp:

Feb 17, 2015, 9:55:27 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

2e786bc4

Parents:

62aec0c2 (diff), 18f4fa25 (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:54:56)

git-committer:

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

Message:

Merge commit '18f4fa251b0eb36392839f5bf6180f280dc04d8d'

• commit '18f4fa251b0eb36392839f5bf6180f280dc04d8d': aac_adtstoasc_bsf: Check extradata memory allocation

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

(No files)