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

author	Michael Niedermayer <michaelni@gmx.at>
	Tue, 25 Nov 2014 00:56:05 +0000 (01:56 +0100)
committer	Michael Niedermayer <michaelni@gmx.at>
	Tue, 25 Nov 2014 00:56:05 +0000 (01:56 +0100)
commit	b83beb131f0d3fdb2d472665f5325f02aeac7d7e
tree	98b6ff4a93d05a92d97c416ed2796c03616d4497	tree \| snapshot
parent	172d22a071b5ba932d365ec5e133bf387f5076ed	commit \| diff
parent	40665d27e38e6a2f65037878202bd1a398c7683e	commit \| diff

Merge commit '40665d27e38e6a2f65037878202bd1a398c7683e'

* commit '40665d27e38e6a2f65037878202bd1a398c7683e':
flvdec: Document how the duration is retrieved at the end of the file

Conflicts:
libavformat/flvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

FFmpeg git repo