Changeset 011d83d in ffmpeg

Timestamp:

Mar 20, 2014, 9:26:31 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

e98bac82

Parents:

3775224b (diff), 0e083d7e (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> (03/20/14 21:21:08)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/20/14 21:26:31)

Message:

Merge commit '0e083d7e43805db1a978cb57bfa25fda62e8ff18'

• commit '0e083d7e43805db1a978cb57bfa25fda62e8ff18': build: Group general components separate from de/encoders in arch Makefiles

Conflicts:

libavcodec/arm/Makefile
libavcodec/x86/Makefile

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

(No files)