Changeset 6016b832 in ffmpeg

Timestamp:

Mar 13, 2014, 11:39:51 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

3a27f968

Parents:

16f619f5 (diff), 05563cca (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/13/14 23:38:47)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/13/14 23:39:51)

Message:

Merge commit '05563ccacc98fd185affdbf8cbaf094caf36b852'

• commit '05563ccacc98fd185affdbf8cbaf094caf36b852': dsputil: cosmetics: Lose camelCase on ff_cropTbl and ff_squareTbl names

Conflicts:

libavcodec/bit_depth_template.c
libavcodec/motionpixels_tablegen.h

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

(No files)