diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-05 16:25:03 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-05 16:53:12 +0100 |
| commit | 83db6cb521c699bec23e542b8fd24a3afc0dfc60 (patch) | |
| tree | ee5debeae5bf8924d30b52e24367a371d75993ce /libavformat/mpeg.c | |
| parent | d2a3f08dafed1f1136e2a9b5ce001a637cafb865 (diff) | |
| parent | e57c4706e969afa1f2384481b955ccd9494cddb5 (diff) | |
| download | ffmpeg-83db6cb521c699bec23e542b8fd24a3afc0dfc60.tar.gz | |
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@gmx.at>
Diffstat (limited to 'libavformat/mpeg.c')
0 files changed, 0 insertions, 0 deletions