Changeset a9f79728 in ffmpeg

Timestamp:

Jun 26, 2014, 6:56:23 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

af75a855

Parents:

e059ac59 (diff), 1b04eb20 (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 '1b04eb20f7e3f0a71f73ba91efcc3d60a435e443'

• commit '1b04eb20f7e3f0a71f73ba91efcc3d60a435e443': lavc: do not allocate edges in the default get_buffer2()

Conflicts:

libavcodec/utils.c

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

(No files)