Changeset d5a64562 in ffmpeg

Timestamp:

Jun 8, 2015, 9:05:01 PM (9 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

1382add

Parents:

3d663574 (diff), 4733a12d (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.

Message:

Merge commit '4733a12dd17a91d606e0079ff9bb48b9f419cbef'

• commit '4733a12dd17a91d606e0079ff9bb48b9f419cbef': rtpdec_asf: Check memory allocation and free memory on error

Conflicts:

libavformat/rtpdec_asf.c

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

(No files)