virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
Mirror of https://git.ffmpeg.org/ffmpeg.git
34,061 Commits 37 Branches 400 Tags 460 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
51bfaa21c8
Go to file
Michael Niedermayer 51bfaa21c8 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (22 commits)
  g722dec: check output buffer size before decoding
  g722dec: cosmetics: reindent/linewrap
  g722dec: remove the use of lowres for half-rate decoding.
  tta: check for extradata allocation failure in tta demuxer
  tta: check for allocation failure of decode_buffer
  tta: use correct frame_length calculation.
  tta: add support for decoding 24-bit sample format
  cosmetics: indentation
  tta: remove pointless braces
  tta: check output buffer size after adjusting frame length for last frame
  tta: fix reading of format in TTA header.
  tta: remove useless commented-out lines
  tta: check remaining bitstream size while reading unary value
  lavf: deprecate AVStream.stream_copy
  avconc: split choose_codec() to choose_decoder/choose_encoder.
  lavf: simplify by using FFMAX/FFMIN.
  mpegenc: add preload private option.
  cosmetics: simplify latm_decode_init
  latm: avoid unnecessary reinit of the aac decoder
  aacdec: initialize sbr context only in new channel elements
  ...

Conflicts:
	avconv.c
	libavcodec/resample.c
	libavcodec/tta.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-26 02:36:07 +02:00
doc Remove CELT / Opus confusion in labels, doc and comments. 2011-10-25 15:04:51 +02:00
ffpresets
libavcodec Merge remote-tracking branch 'qatar/master' 2011-10-26 02:36:07 +02:00
libavdevice pulse: Change application name to LIBAVFORMAT_IDENT 2011-10-26 01:00:45 +02:00
libavfilter vsrc_testsrc: fix off-by-one logic when detecting the EOF time in request_frame() 2011-10-25 23:38:56 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2011-10-26 02:36:07 +02:00
libavutil Check for cbrtf() and provide fallback 2011-10-22 19:49:27 +02:00
libpostproc
libswresample rematrix: add parameter to tune volume 2011-10-26 00:46:46 +02:00
libswscale sws: replace long by x86_reg in x86 asm 2011-10-24 12:23:51 +02:00
mt-work
presets Remove redundant libx264 preset files 2011-10-22 01:32:10 +02:00
tests Merge remote-tracking branch 'qatar/master' 2011-10-23 05:13:56 +02:00
tools tools: add a tool for enumerating/printing AVOptions in texinfo format 2011-10-24 14:18:07 +02:00
.gitignore
avconv.c Merge remote-tracking branch 'qatar/master' 2011-10-26 02:36:07 +02:00
Changelog Merge remote-tracking branch 'luzero/pulse' 2011-10-22 01:56:57 +02:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak Add rule for compiling to asm 2011-10-22 20:49:24 +02:00
configure Remove CELT / Opus confusion in labels, doc and comments. 2011-10-25 15:04:51 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg.c Merge remote-tracking branch 'qatar/master' 2011-10-26 02:36:07 +02:00
ffplay.c ffplay: add frame drop statistics 2011-10-24 22:44:47 +02:00
ffprobe.c
ffserver.c
INSTALL
LICENSE
MAINTAINERS
Makefile
README
RELEASE
subdir.mak Add rule for compiling to asm 2011-10-22 20:49:24 +02:00
version.sh

README 

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.