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

author	Michael Niedermayer <michaelni@gmx.at>
	Mon, 24 Nov 2014 12:38:23 +0000 (13:38 +0100)
committer	Michael Niedermayer <michaelni@gmx.at>
	Mon, 24 Nov 2014 12:40:06 +0000 (13:40 +0100)
commit	f41d409b7a6cc0295d45c4ac879f8df7d0cc9a76
tree	50a1df5c1a4eecd7fb6332cccf4ec5dc85d9175b	tree \| snapshot
parent	d2e0543766e0c8c077ab51495991f47066d9e768	commit \| diff
parent	55b59fab880a9fcdd30f97c5170af282087ac4f7	commit \| diff

Merge commit '55b59fab880a9fcdd30f97c5170af282087ac4f7'

* commit '55b59fab880a9fcdd30f97c5170af282087ac4f7':
roqaudio: Always use the frame buffer on flush

Conflicts:
libavcodec/roqaudioenc.c

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

FFmpeg git repo