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

author	Derek Buitenhuis <derek.buitenhuis@gmail.com>
	Thu, 31 Mar 2016 20:19:49 +0000 (21:19 +0100)
committer	Derek Buitenhuis <derek.buitenhuis@gmail.com>
	Thu, 31 Mar 2016 20:20:02 +0000 (21:20 +0100)
commit	e6053b3b19c070e994a501fe0cc20255d15c4aa8
tree	493b0d19d642476b404abf043d4ae696b853ef05	tree \| snapshot
parent	f9b1cf15c233dde29f3659c903e32f74be4fdb95	commit \| diff
parent	a8068346e48e123f8d3bdf4d64464d81e53e5fc7	commit \| diff

Merge commit 'a8068346e48e123f8d3bdf4d64464d81e53e5fc7'

* commit 'a8068346e48e123f8d3bdf4d64464d81e53e5fc7':
lavc: add a variant of av_get_audio_frame_duration working with AVCodecParameters

Fixes from jamrial incorporated.

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

FFmpeg git repo