Changeset 4ccb7911 in ffmpeg

Timestamp:

Jun 26, 2011, 12:31:32 AM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

b3ca11f

Parents:

5fba761f (diff), d0ce090e (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 remote-tracking branch 'qatar/master'

• qatar/master: ARM: silence some annoying armcc warnings ffplay: Remove unused-but-set channels variable from update_sample_display(). build: Add DEP_LIBS dependency directly to the shared library build rule. build: Remove multiple inclusion guards from config.mak. build: Remove redundant config.mak includes from subdirectory Makefiles. aacenc: Mark psy_3gpp_window() as av_unused.

Conflicts:

configure

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

(No files)