Changeset 3e27149 in ffmpeg

Timestamp:

Feb 13, 2015, 11:34:18 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

b39ac9d2

Parents:

c74b3983 (diff), eea769df (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> (02/13/15 11:32:30)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (02/13/15 11:34:18)

Message:

Merge commit 'eea769df322fac2601a96db195fa7dc8d12a8fbc'

• commit 'eea769df322fac2601a96db195fa7dc8d12a8fbc': hevc: Use generic av_clip function, not C implementation

Conflicts:

libavcodec/hevc.c
libavcodec/hevc_filter.c
libavcodec/hevc_mvs.c

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

(No files)