git.ffmpeg.org Git - ffmpeg.git/commit

projects / ffmpeg.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: dcdd521 7b1f034)

author	Clément Bœsch <u@pkh.me>
	Wed, 29 Mar 2017 12:07:39 +0000 (14:07 +0200)
committer	Clément Bœsch <u@pkh.me>
	Wed, 29 Mar 2017 12:09:09 +0000 (14:09 +0200)
commit	925ce244d873fb6a0cda0da6e1f8d34dc721ea53
tree	4363c155129aae11d2c3ae0a5cc6d10bfd61b2da	tree \| snapshot
parent	dcdd52101f31f696dfe7a919d6fa6879c1b40945	commit \| diff
parent	7b1f03477f1a43d2261fbd83e50a4ad90c7f806d	commit \| diff

Merge commit '7b1f03477f1a43d2261fbd83e50a4ad90c7f806d'

* commit '7b1f03477f1a43d2261fbd83e50a4ad90c7f806d':
examples/avcodec: split the remaining two examples into separate files

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

configure	diff1 \|	diff2 \|	blob \| history
doc/Makefile	diff1 \|	diff2 \|	blob \| history
doc/examples/.gitignore	diff1 \|	diff2 \|	blob \| history
doc/examples/Makefile	diff1 \|	\|	blob \| history
doc/examples/decode_video.c	\|	diff2 \|	blob \| history
doc/examples/encode_video.c	\|	diff2 \|	blob \| history

FFmpeg git repo