FFmpeg git repo
Go to file
Michael Niedermayer 83db6cb521 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>
2012-12-05 16:53:12 +01:00
compat
doc Ensoniq Paris Audio File demuxer 2012-12-05 13:01:22 +00:00
libavcodec Merge commit 'e57c4706e969afa1f2384481b955ccd9494cddb5' 2012-12-05 16:53:12 +01:00
libavdevice Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967' 2012-12-05 13:34:45 +01:00
libavfilter Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967' 2012-12-05 13:34:45 +01:00
libavformat ircamenc: 10l do not use avio_skip() 2012-12-05 13:46:35 +00:00
libavresample
libavutil Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967' 2012-12-05 13:34:45 +01:00
libpostproc
libswresample lswr/swresample: use AV_OPT_TYPE_SAMPLE_FMT for sample format options 2012-12-03 13:49:56 +01:00
libswscale swscale: fix 12 and 14 bit YUV planar output with scaling. 2012-12-01 03:41:24 +01:00
presets
tests ircamenc: 10l do not use avio_skip() 2012-12-05 13:46:35 +00:00
tools
.gitignore
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Changelog Ensoniq Paris Audio File demuxer 2012-12-05 13:01:22 +00:00
INSTALL
LICENSE
MAINTAINERS
Makefile
README
RELEASE
arch.mak
cmdutils.c Merge commit 'ff953fecffd3b9a616a046723fb9d4690be032a6' 2012-12-05 15:58:07 +01:00
cmdutils.h
cmdutils_common_opts.h
common.mak
configure Merge remote-tracking branch 'qatar/master' 2012-12-04 14:23:22 +01:00
ffmpeg.c ffmpeg: small indent fix. 2012-12-04 16:40:11 +01:00
ffmpeg.h
ffmpeg_filter.c
ffmpeg_opt.c ffmpeg: use avformat_seek_file() instead of av_seek_frame(). 2012-12-02 00:06:02 +01:00
ffplay.c Merge remote-tracking branch 'qatar/master' 2012-11-29 14:22:58 +01:00
ffprobe.c
ffserver.c
library.mak
version.sh

README

FFmpeg README
-------------

1) Documentation
----------------

* Read the documentation in the doc/ directory in git.
  You can also view it online at http://ffmpeg.org/documentation.html

2) Licensing
------------

* See the LICENSE file.

3) Build and Install
--------------------

* See the INSTALL file.