RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-20 05:46:57 +00:00
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
37,694 Commits 37 Branches 400 Tags 272 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
0af8ed29e4
Go to file
Michael Niedermayer 0af8ed29e4 Merge commit 'f82e127dd9c7c0d54bf6400f83c7825e571f9a9e' into release/0.10 
* commit 'f82e127dd9c7c0d54bf6400f83c7825e571f9a9e':
  parser: fix large overreads
  dsputil: fix invalid array indexing
  shorten: use the unsigned type where needed
  shorten: report meaningful errors
  shorten: K&R formatting cosmetics
  shorten: set invalid channels count to 0
  matroskadec: request a read buffer for the wav header
  h264: check for luma and chroma bit depth being equal
  vc1: Move init code shared between decoder and parser to common code file.
  libmp3lame: use the correct remaining buffer size when flushing
  xxan: fix invalid memory access in xan_decode_frame_type0()
  wmadec: require block_align to be set.

Conflicts:
	libavcodec/h264.c
	libavcodec/libmp3lame.c
	libavcodec/shorten.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-07 15:33:22 +02:00
doc Merge commit '9b79a05289d91d1184455d12e6c4df457f0657c4' into release/0.10 2013-04-07 14:47:49 +02:00
ffpresets Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
libavcodec Merge commit 'f82e127dd9c7c0d54bf6400f83c7825e571f9a9e' into release/0.10 2013-04-07 15:33:22 +02:00
libavdevice buildsystem: 10l add v4l entry back 2012-01-25 00:46:41 +01:00
libavfilter vf_fade: fix memleaks of args 2012-10-25 21:12:39 +02:00
libavformat Merge commit 'f82e127dd9c7c0d54bf6400f83c7825e571f9a9e' into release/0.10 2013-04-07 15:33:22 +02:00
libavutil Merge remote-tracking branch 'qatar/release/0.8' into release/0.10 2013-01-17 02:33:07 +01:00
libpostproc pp: avoid overflow in w*h 2012-10-25 21:19:56 +02:00
libswresample libswresample: introduce int swr_set_compensation() instead of void swr_compensate() 2012-01-09 04:16:06 +01:00
libswscale sws: dont write out of array on bigendian 2013-02-14 14:42:41 +01:00
mt-work Update todo 2011-06-12 18:01:29 +02:00
presets Remove redundant libx264 preset files 2011-10-22 01:32:10 +02:00
tests Merge remote-tracking branch 'qatar/release/0.8' into release/0.10 2012-10-16 04:25:51 +02:00
tools ffeval: avoid folding EOF onto a valid char 2012-10-25 21:19:56 +02:00
.gitignore Ignore generated aviocat tool. 2013-01-03 15:20:12 +01:00
Changelog Update Changelog 2013-01-12 17:59:41 +01:00
cmdutils_common_opts.h ff*: add -max_alloc command line option 2011-12-25 18:55:43 +01:00
cmdutils.c Merge commit '9b79a05289d91d1184455d12e6c4df457f0657c4' into release/0.10 2013-04-07 14:47:49 +02:00
cmdutils.h Drop unnecessary prefix from *sink* variable and struct names. 2012-01-25 12:28:36 +01:00
common.mak Merge commit '01a4e7f623a2e6dc95862f9a56c777f058d7bfaf' into release/0.10 2013-01-17 01:58:54 +01:00
configure Merge commit '9b79a05289d91d1184455d12e6c4df457f0657c4' into release/0.10 2013-04-07 14:47:49 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
Doxyfile Update for 0.10.6 2012-10-25 21:43:19 +02:00
ffmpeg.c ffmpeg: dont allow -flags to override -pass 2013-02-06 10:23:45 +01:00
ffplay.c Merge remote-tracking branch 'qatar/master' 2012-01-26 02:23:56 +01:00
ffprobe.c ffprobe: fix use of uninitialized pointer in av_strtok() 2012-10-25 21:09:14 +02:00
ffserver.c ffserver: prevent nb_streams from becoming too large 2012-10-25 21:12:37 +02:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
library.mak Merge commit '01a4e7f623a2e6dc95862f9a56c777f058d7bfaf' into release/0.10 2013-01-17 01:58:54 +01:00
LICENSE libaac+ support 2011-09-26 02:28:21 +02:00
MAINTAINERS maintainers: add myself for recent works. 2012-01-24 16:07:53 +01:00
Makefile Merge commit '01a4e7f623a2e6dc95862f9a56c777f058d7bfaf' into release/0.10 2013-01-17 01:58:54 +01:00
README Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
RELEASE Update RELEASE file for 0.8.6 2013-03-09 18:54:28 +01:00
VERSION Update for 0.10.6 2012-10-25 21:43:19 +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.

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

* See the LICENSE file.