Changeset c4979763 in ffmpeg

Timestamp:

Mar 14, 2014, 12:57:41 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

866e11b

Parents:

cbf190f7 (diff), bbf0ef57 (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 'bbf0ef57e9d2d7bb2995f664dd74c8229bca25f5'

• commit 'bbf0ef57e9d2d7bb2995f664dd74c8229bca25f5': bfin: Move all assembly declarations only used within one .c file there

Conflicts:

libavcodec/bfin/dsputil_bfin.h
libavcodec/bfin/vp3_bfin.h

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

(No files)