libavcodec/roqaudioenc.c · 934c315c2090317d7e8b51b7f63a53e65a90278c · submodule / ffmpeg

Merge commit '' into release/2.4 · 5b965a50

Michael Niedermayer authored Jan 18, 2015

* commit '12e1a701':
  roqaudio: Always use the frame buffer on flush

Conflicts:
	libavcodec/roqaudioenc.c

See: a1af505d
See: c0b17ea1Merged-by: Michael Niedermayer <michaelni@gmx.at>

5b965a50

roqaudioenc.c 5.7 KB

Replace roqaudioenc.c