RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-03-11 06:58:18 +00:00
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
34,106 Commits 37 Branches 401 Tags 286 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.1%
Other 0.1%
173715d291
Go to file
Michael Niedermayer 173715d291 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (35 commits)
  libopencore-amr: check output buffer size before decoding
  libopencore-amr: remove unneeded buf_size==0 check.
  libopencore-amr: remove unneeded frame_count field.
  aac_latm: remove unneeded check for zero-size packet.
  pcmdec: fix output buffer size check by calculating the actual output size prior to decoding.
  pcmdec: move codec-specific variable declarations to the corresponding codec blocks.
  pcmdec: return buf_size instead of src-buf.
  avcodec: remove the Zork PCM encoder.
  pcm_zork: use AV_SAMPLE_FMT_U8 instead of shifting all samples by 8.
  pcmenc: remove unneeded sample_fmt check.
  pcmdec: move number of channels check to pcm_decode_init()
  pcmdec: remove unnecessary check for sample_fmt change
  pcmdec: move DVD PCM bits_per_coded_sample check near to the code that sets the sample size.
  pcmdec: do not needlessly set *data_size to 0
  alacdec: remove unneeded NULL or zero-size packet checks.
  alacdec: simplify buffer allocation by using FF_ALLOC_OR_GOTO()
  alacdec: ask for a sample for unsupported sample depths.
  alacdec: cosmetics: use 'ch' instead of 'chan' to iterate channels
  alacdec: move some declarations to the top of the function
  alacdec: always use get_sbits_long() for uncompressed samples
  ...

Conflicts:
	libavcodec/pcm.c
	tests/ref/acodec/pcm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-27 01:39:04 +02:00
doc Merge remote-tracking branch 'qatar/master' 2011-10-27 01:39:04 +02:00
ffpresets
libavcodec Merge remote-tracking branch 'qatar/master' 2011-10-27 01:39:04 +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 Timecode v2 muxer 2011-10-27 01:03:22 +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-27 01:39:04 +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.