Changeset 6d34aa24 in ffmpeg

Timestamp:
Nov 26, 2013, 12:31:00 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
325c918f
Parents:
5ded4332 (diff), ab81f24a (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 'ab81f24ad43bddf77ddd25cba86780c1c884996c'

Conflicts:

configure
doc/Makefile
doc/examples/muxing.c
doc/examples/output.c
libavformat/Makefile
libavformat/output-example.c

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

(No files)

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