git.sesse.net Git - ffmpeg/commit

]> git.sesse.net Git - ffmpeg/commit

author	Michael Niedermayer <michaelni@gmx.at>
	Sun, 26 Jan 2014 00:39:33 +0000 (01:39 +0100)
committer	Michael Niedermayer <michaelni@gmx.at>
	Sun, 26 Jan 2014 00:54:55 +0000 (01:54 +0100)
commit	965fa6b0d9d99afbbef8b3fcb8066ce4136b8c35
tree	1c00ee6a0981502047f9c0a3e53ec79a7af900b9	tree \| snapshot
parent	53167ecfdb99151c1f0d243275675a75efb881a7	commit \| diff
parent	fb0c9d41d685abb58575c5482ca33b8cd457c5ec	commit \| diff

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>

12 files changed:

Unnamed repository; edit this file 'description' to name the repository.