git.sesse.net Git - ffmpeg/commit

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

projects / ffmpeg / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 87d1f82 debca90)

author	Clément Bœsch <u@pkh.me>
	Wed, 27 Jul 2016 16:07:30 +0000 (18:07 +0200)
committer	Clément Bœsch <u@pkh.me>
	Wed, 27 Jul 2016 16:07:30 +0000 (18:07 +0200)
commit	6c41eda18ec0ef48763e1672266f7563f05775a5
tree	57a70af28ce9da192990ce87506e5d2d753ee40d	tree \| snapshot
parent	87d1f820591b87bec452f33f451dee4db142ee9a	commit \| diff
parent	debca90863e4ee53447efd02483c500f89766384	commit \| diff

Merge commit 'debca90863e4ee53447efd02483c500f89766384'

* commit 'debca90863e4ee53447efd02483c500f89766384':
h264: store {curr,max}_pic_num in the per-slice context

Merged-by: Clément Bœsch <u@pkh.me>

libavcodec/h264.h	diff1 \|	diff2 \|	blob \| history
libavcodec/h264_refs.c	diff1 \|	diff2 \|	blob \| history
libavcodec/h264_slice.c	diff1 \|	diff2 \|	blob \| history

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