[FFmpeg-cvslog] Merge commit 'e57c4706e969afa1f2384481b955ccd9494cddb5'

Michael Niedermayer git at videolan.org
Wed Dec 5 17:01:00 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Dec  5 16:25:03 2012 +0100| [83db6cb521c699bec23e542b8fd24a3afc0dfc60] | committer: Michael Niedermayer

Merge commit 'e57c4706e969afa1f2384481b955ccd9494cddb5'

* commit 'e57c4706e969afa1f2384481b955ccd9494cddb5':
  lavc: don't reuse audio buffers

This commit causes a 0.5% speedloss for mp3 and 2% for raw pcm, that is
"time ffmpeg" style tested thus includes disk IO, demux and parsing

I would not have merged it if it wasnt required for the "new" buffer API
but sadly it is.
Once the new API is in ill reimplement proper buffer reuse, which will
fix this speedloss. In case we choose not to merge the "new" buffer
API then this commit here should be reverted.

Conflicts:
	libavcodec/internal.h
	libavcodec/utils.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=83db6cb521c699bec23e542b8fd24a3afc0dfc60
---





More information about the ffmpeg-cvslog mailing list