git.sesse.net Git - ffmpeg/commit

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

projects / ffmpeg / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 15b26e8 251cbb4)

author	Clément Bœsch <u@pkh.me>
	Fri, 29 Jul 2016 09:13:44 +0000 (11:13 +0200)
committer	Clément Bœsch <u@pkh.me>
	Fri, 29 Jul 2016 09:13:44 +0000 (11:13 +0200)
commit	ecf65c30cf7545c72c0e27b32283fc9c55b03544
tree	edaed0920d675856ae7eb9fdf90a7ce5fc9d7d5c	tree \| snapshot
parent	15b26e88cb7c775e0e7a422ab6b088b5690f31ad	commit \| diff
parent	251cbb44003caf179fb17afbb8a6c56643c2a646	commit \| diff

Merge commit '251cbb44003caf179fb17afbb8a6c56643c2a646'

* commit '251cbb44003caf179fb17afbb8a6c56643c2a646':
h264: create a new header for common h264 definitions

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

libavcodec/h264.h	\|	diff2 \|	blob \| history
libavcodec/h264_parse.c	diff1 \|	diff2 \|	blob \| history
libavcodec/h264_parser.c	diff1 \|	diff2 \|	blob \| history
libavcodec/h264_refs.c	diff1 \|	diff2 \|	blob \| history
libavcodec/h264_slice.c	diff1 \|	diff2 \|	blob \| history
libavcodec/h264dec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/h264dec.h	diff1 \|	diff2 \|	blob \| history
libavcodec/omx.c	diff1 \|	diff2 \|	blob \| history
libavcodec/vaapi_encode_h264.c	diff1 \|	diff2 \|	blob \| history
libavformat/mxfenc.c	diff1 \|	diff2 \|	blob \| history

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