Changeset 92424a4 in ffmpeg

Timestamp:
Sep 6, 2013, 10:05:02 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
5866c107
Parents:
bcd1c206 (diff), b634b36f (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 'b634b36fcebfe16b837b6c4044f5d5cb99a75040'

Conflicts:

libavutil/mem.c
libavutil/mem.h

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

(No files)

Note: See TracChangeset for help on using the changeset viewer.