Changeset 8895b71d in ffmpeg

Timestamp:

Oct 16, 2013, 9:30:17 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

6659eb71

Parents:

3a8b52c0 (diff), 29c455ce (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 '29c455ce3daf7fb369ba20cf77c74bd8e3b43b55'

• commit '29c455ce3daf7fb369ba20cf77c74bd8e3b43b55': bitstream: Check the result of av_malloc()

Conflicts:

libavcodec/bitstream.c

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

(No files)