Changeset 28207bfa in ffmpeg

Timestamp:
Jan 15, 2014, 2:20:30 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
bf0470a
Parents:
19fc3c01 (diff), c65d67ef (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 'c65d67ef50241886b9749e88fd333c52090f70c7'

Conflicts:

libavcodec/hpeldsp.c
libavcodec/hpeldsp.h

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

(No files)

Note: See TracChangeset for help on using the changeset viewer.