RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-29 10:52:20 +00:00
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
44,882 Commits 37 Branches 400 Tags 246 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
b96dc093ea
Go to file
Michael Niedermayer b96dc093ea Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  wmalosslessdec: increase channel_coeffs/residues size
  wmalosslessdec: increase WMALL_BLOCK_MAX_BITS to 14.
  lagarith: check count before writing zeros.
  wmaprodec: check num_vec_coeffs for validity
  avidec: use actually read size instead of requested size
  avidec: return 0, not packet size from read_packet().

Conflicts:
	libavcodec/lagarith.c
	libavcodec/wmalosslessdec.c
	libavcodec/wmaprodec.c
	libavformat/avidec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-29 15:11:34 +02:00
compat MinGW: Use our snprintf/vsnprintf when MinGW's is broken 2012-09-25 18:14:14 -04:00
doc ffprobe: add support to library ident printing 2012-09-29 10:24:28 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2012-09-29 15:11:34 +02:00
libavdevice Add missing version macros to libraries 2012-09-28 15:10:18 +02:00
libavfilter Add missing version macros to libraries 2012-09-28 15:10:18 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-09-29 15:11:34 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2012-09-14 14:13:38 +02:00
libavutil MinGW: Use our snprintf/vsnprintf when MinGW's is broken 2012-09-25 18:14:14 -04:00
libpostproc postproc: Create version.h header 2012-09-28 15:06:26 +02:00
libswresample swresample: Create version.h header 2012-09-28 15:10:36 +02:00
libswscale swscale: change assert() to av_assert() 2012-09-18 05:19:11 +02:00
presets
tests mov: remove default of 1024 sample skip for aac. 2012-09-28 20:30:37 +02:00
tools Fix two "skiping" typo. 2012-09-25 07:42:32 +02:00
.gitignore gitignore: codec_names.h is no more 2012-09-07 14:59:01 +02:00
arch.mak
Changelog Opus decoder using libopus 2012-09-28 11:03:20 +02:00
cmdutils_common_opts.h cmdutils: add -layouts option. 2012-08-28 15:09:49 +02:00
cmdutils.c cmdutils: sort codec lists. 2012-09-23 21:05:29 +02:00
cmdutils.h Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5' 2012-08-31 13:01:30 +02:00
common.mak Merge remote-tracking branch 'qatar/master' 2012-09-16 14:55:00 +02:00
configure swresample: Create version.h header 2012-09-28 15:10:36 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg_filter.c Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521' 2012-09-18 14:45:44 +02:00
ffmpeg_opt.c ffmpeg: add option to control copying of frames prior to start. 2012-09-27 03:52:31 +02:00
ffmpeg.c ffmpeg: add option to control copying of frames prior to start. 2012-09-27 03:52:31 +02:00
ffmpeg.h ffmpeg: add option to control copying of frames prior to start. 2012-09-27 03:52:31 +02:00
ffplay.c Merge commit '7751e4693dd10ec98c20fbd9887233b575034272' 2012-09-25 15:15:16 +02:00
ffprobe.c ffprobe: rework/fix ini writer 2012-09-29 10:25:11 +02:00
ffserver.c ffserver: fix typo in log message 2012-09-18 21:11:06 -05:00
INSTALL
library.mak Merge commit '581281e242609a222233a2e5538b89dfb88fb18e' 2012-09-20 03:20:29 +02:00
LICENSE
MAINTAINERS MAINTAINERS: add 1.0 2012-09-27 01:48:14 +02:00
Makefile Makefile: remove old codec_names.h on distclean 2012-09-07 14:59:01 +02:00
README
RELEASE RELEASE: update for 1.0 2012-09-27 01:48:14 +02:00
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.