Changeset 7a64f168 in ffmpeg

Timestamp:

Dec 5, 2014, 8:41:01 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

47c066f2

Parents:

4ba01419 (diff), 56de2897 (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> (12/05/14 20:39:41)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (12/05/14 20:41:01)

Message:

Merge commit '56de2897a68e3a8795b0b3c593dad1c5832696e0'

• commit '56de2897a68e3a8795b0b3c593dad1c5832696e0': h264: Fix memory leak on ff_h264_decode_init() failure

Conflicts:

libavcodec/h264.c

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

(No files)