Changeset b654aa6b in ffmpeg

Timestamp:
Sep 27, 2013, 11:05:05 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
fc424f37
Parents:
e82071e7 (diff), 7e52080c (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.
git-author:
Michael Niedermayer <michaelni@gmx.at> (09/27/13 10:59:53)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (09/27/13 11:05:05)
Message:

Merge commit '7e52080cb18332cb1da9fe133498750b6b4b0fb3'

Conflicts:

doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/pcm.c
libavcodec/version.h
libavformat/nut.c

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

(No files)

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