git.sesse.net Git - ffmpeg/commit

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

projects / ffmpeg / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: fb41bad 94eed68)

author	James Almer <jamrial@gmail.com>
	Mon, 23 Oct 2017 20:06:05 +0000 (17:06 -0300)
committer	James Almer <jamrial@gmail.com>
	Mon, 23 Oct 2017 20:08:32 +0000 (17:08 -0300)
commit	bfab4308560c277d754c214210758a865fcc7348
tree	609493b886bed4b8a94bf89a6b8cad269224fb3b	tree \| snapshot
parent	fb41bad7e051240017bc4cc79c50ea36ac12b96c	commit \| diff
parent	94eed68ace9f2416af8457fcbf142b175928c06b	commit \| diff

Merge commit '94eed68ace9f2416af8457fcbf142b175928c06b'

* commit '94eed68ace9f2416af8457fcbf142b175928c06b':
lavc: Drop deprecated options moved to private contexts

Merged-by: James Almer <jamrial@gmail.com>

14 files changed:

libavcodec/avcodec.h	diff1 \|	diff2 \|	blob \| history
libavcodec/dnxhdenc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/internal.h	diff1 \|	diff2 \|	blob \| history
libavcodec/libvpxenc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/libx264.c	diff1 \|	diff2 \|	blob \| history
libavcodec/libxavs.c	diff1 \|	diff2 \|	blob \| history
libavcodec/libxvid.c	diff1 \|	diff2 \|	blob \| history
libavcodec/motion_est.c	diff1 \|	diff2 \|	blob \| history
libavcodec/mpegvideo.h	diff1 \|	diff2 \|	blob \| history
libavcodec/mpegvideo_enc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/options_table.h	diff1 \|	diff2 \|	blob \| history
libavcodec/snowenc.c	diff1 \|	\|	blob \| history
libavcodec/svq1enc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/version.h	diff1 \|	diff2 \|	blob \| history

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