Changeset 877716a7 in ffmpeg

Timestamp:

Jun 26, 2014, 9:58:00 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

9a2850c

Parents:

5a55d5e4 (diff), 6a927d7a (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 '6a927d7aaf5625e83a674072913b9e292a303fd1'

• commit '6a927d7aaf5625e83a674072913b9e292a303fd1': output example: use a macro instead of a static variable

Conflicts:

doc/examples/muxing.c

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

(No files)