Changeset 63b03562 in ffmpeg

Timestamp:

Jun 12, 2015, 7:55:40 PM (9 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

449c74f6

Parents:

b68b5ec (diff), b7a4127a (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> (06/12/15 19:55:24)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (06/12/15 19:55:40)

Message:

Merge commit 'b7a4127a45b780d76e6b09427a3d0197c4bc1cdb'

• commit 'b7a4127a45b780d76e6b09427a3d0197c4bc1cdb': h264_qpel: Use the correct header

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

(No files)