git.sesse.net Git - ffmpeg/commit

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

author	Derek Buitenhuis <derek.buitenhuis@gmail.com>
	Wed, 27 Jan 2016 20:18:04 +0000 (20:18 +0000)
committer	Derek Buitenhuis <derek.buitenhuis@gmail.com>
	Wed, 27 Jan 2016 20:18:04 +0000 (20:18 +0000)
commit	2e9b995e4f7f6457a36331e66fb78a5676cd9b25
tree	1134c54348410c273ee9bf04101445ffbbc7cc39	tree \| snapshot
parent	11e6f13a13302dae18a1a83dac72fd9df0a69139	commit \| diff
parent	0e6c8532215790bbe560a9eea4f3cc82bb55cf92	commit \| diff

Merge commit '0e6c8532215790bbe560a9eea4f3cc82bb55cf92'

* commit '0e6c8532215790bbe560a9eea4f3cc82bb55cf92'
lavc: Move b_frame_strategy and b_sensitivity to codec private options

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

12 files changed:

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