Changeset c43ebd94 in ffmpeg

Timestamp:

Mar 31, 2014, 7:50:24 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

0f714abb

Parents:

4ea333d7 (diff), 33259118 (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/31/14 19:49:58)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/31/14 19:50:24)

Message:

Merge commit '33259118155764ce27a3433894659dda1d148b5f'

• commit '33259118155764ce27a3433894659dda1d148b5f': h263: improve hwaccel #ifdefs

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

(No files)