Changeset 5ba16483 in ffmpeg

Timestamp:

Feb 28, 2014, 4:13:00 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

18d870da

Parents:

f3eef027 (diff), b2365049 (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 'b23650491fbd579a4365f42bd42575afb7b53f7e'

• commit 'b23650491fbd579a4365f42bd42575afb7b53f7e': prores: Use consistent names for DSP arch initialization functions

Conflicts:

libavcodec/proresdsp.c
libavcodec/proresdsp.h
libavcodec/x86/proresdsp_init.c

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

(No files)