Changeset d1f7b313 in ffmpeg

Timestamp:

Jun 8, 2015, 8:37:41 PM (9 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

77510a96

Parents:

01a6ae13 (diff), f7e93247 (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 'f7e932473314e6ca4c851d49cbde8570b6e66383'

• commit 'f7e932473314e6ca4c851d49cbde8570b6e66383': audiointerleave: Always initialize new_pkt

Conflicts:

libavformat/audiointerleave.c

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

(No files)