wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
No description
47472 commits 40 branches 405 tags 230 MiB
Find a file
Michael Niedermayer 83db6cb521 Merge commit 'e57c4706e9' 
* commit 'e57c4706e9':
  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 Merge commit '0c03cc6838' 2012-10-24 13:42:58 +02:00
doc Ensoniq Paris Audio File demuxer 2012-12-05 13:01:22 +00:00
libavcodec Merge commit 'e57c4706e9' 2012-12-05 16:53:12 +01:00
libavdevice Merge commit 'cb45553f57' 2012-12-05 13:34:45 +01:00
libavfilter Merge commit 'cb45553f57' 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 Merge commit 'f5fa03660d' 2012-11-28 13:27:18 +01:00
libavutil Merge commit 'cb45553f57' 2012-12-05 13:34:45 +01:00
libpostproc pp: add SSE2 deInterlaceInterpolateCubic(). 2012-11-18 16:21:59 +01:00
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 presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests ircamenc: 10l do not use avio_skip() 2012-12-05 13:46:35 +00:00
tools Replace rest of libavutil/audioconvert.h with libavutil/channel_layout.h 2012-11-13 13:21:21 +00:00
.gitignore .gitignore: ignore *.3 files as well 2012-11-06 12:24:12 +01:00
arch.mak Merge commit 'ca411fc1d3' 2012-10-13 15:25:11 +02:00
Changelog Ensoniq Paris Audio File demuxer 2012-12-05 13:01:22 +00:00
cmdutils.c Merge commit 'ff953fecff' 2012-12-05 15:58:07 +01:00
cmdutils.h Revert "cmdutils: allow specifying the file for -report" 2012-11-04 10:47:52 +01:00
cmdutils_common_opts.h Revert "cmdutils: allow specifying the file for -report" 2012-11-04 10:47:52 +01:00
common.mak Merge commit '4a606c830a' 2012-11-23 13:30:51 +01:00
configure Merge remote-tracking branch 'qatar/master' 2012-12-04 14:23:22 +01:00
COPYING.GPLv2 Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1. 2009-06-05 09:51:31 +00:00
COPYING.GPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
COPYING.LGPLv2.1 cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
COPYING.LGPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
CREDITS Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
ffmpeg.c ffmpeg: small indent fix. 2012-12-04 16:40:11 +01:00
ffmpeg.h ffmpeg: fix swr filter_type for auto inserted aresample filters 2012-11-26 04:06:19 +01:00
ffmpeg_filter.c ffmpeg: fix swr filter_type for auto inserted aresample filters 2012-11-26 04:06:19 +01:00
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 ffprobe: free dictionary in opt_show_entries() 2012-11-23 18:49:26 +01:00
ffserver.c ffserver remove CONFIG_NOCUTILS check 2012-11-27 14:41:41 +01:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
library.mak Merge commit '4a606c830a' 2012-11-23 13:30:51 +01:00
LICENSE lavfi: add geq filter. 2012-11-11 23:12:54 +01:00
MAINTAINERS MAINTAINERS: fix entry for img2 2012-11-06 01:46:21 +01:00
Makefile Merge commit '4a606c830a' 2012-11-23 13:30:51 +01:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE Merge commit 'ceb754d041' 2012-10-24 14:01:36 +02:00
version.sh version.sh: handle shallow clones and snapshots. 2011-07-22 10:43:59 +02:00

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.