Changeset 965fa6b0 in ffmpeg

Timestamp:

Jan 26, 2014, 12:54:55 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

3e6088f7

Parents:

53167ecf (diff), fb0c9d41 (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> (01/26/14 00:39:33)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (01/26/14 00:54:55)

Message:

Merge commit 'fb0c9d41d685abb58575c5482ca33b8cd457c5ec'

• commit 'fb0c9d41d685abb58575c5482ca33b8cd457c5ec': avutil: remove timer.h include from internal.h

Conflicts:

libavcodec/ffv1dec.c
libavutil/internal.h

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

(No files)