git.sesse.net Git - ffmpeg/commit

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

author	Michael Niedermayer <michaelni@gmx.at>
	Sat, 21 Mar 2015 15:09:14 +0000 (16:09 +0100)
committer	Michael Niedermayer <michaelni@gmx.at>
	Sat, 21 Mar 2015 15:09:14 +0000 (16:09 +0100)
commit	70eec8f432dcee5b9867ba01a26436a04a9a0423
tree	c8880981559e31c14696486f7b300ed5c9cf0076	tree \| snapshot
parent	da7f4c32ab6bf517d4ef51297da46cf459479b22	commit \| diff
parent	47a0d393504d6726c4a235951153bee0abb3f7d6	commit \| diff

Merge commit '47a0d393504d6726c4a235951153bee0abb3f7d6'

* commit '47a0d393504d6726c4a235951153bee0abb3f7d6':
h264: move mb_skip_run into the per-slice context

Conflicts:
libavcodec/h264_cavlc.c

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

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