RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-03-25 04:19:05 +00:00
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
31,018 Commits 37 Branches 403 Tags 294 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.1%
Other 0.1%
095946afa7
Go to file
Michael Niedermayer 095946afa7 Merge remote-tracking branch 'qatar/release/0.7' into release/0.8 
* qatar/release/0.7: (65 commits)
  riff: Add mpgv MPEG-2 fourcc
  Update Changelog
  matroskadec: fix integer underflow if header length < probe length.
  ffmpeg: fix operation with --disable-avfilter
  vf_libopencv: replace opencv/cxtypes.h #include by opencv/cxcore.h
  build: Create mlib optimization directories during out-of-tree builds.
  changelog: misc typo and wording fixes (cherry picked from commit b047941d7d)
  doc: Remove outdated comments about gcc 2.95 and gcc 3.3 support. (cherry picked from commit 5ccbf80963)
  matroskadec: matroska_read_seek after after EBML_STOP leads to failure.
  Update RELEASE file
  update Changelog
  mt: proper locking around release_buffer calls.
  vp8/mt: flush worker thread, not application thread context, on seek.
  docs: Mention the upstream bugzilla url about the dlltool vs MSVC issue
  docs: Use proper markup for a literal command line option
  docs: Don't recommend adding --enable-memalign-hack
  docs: Remove needless configure options
  oggdec: prevent heap corruption.
  oggdec: Abort Ogg header parsing when encountering a data packet.
  Add LGPL license boilerplate to files lacking it.
  ...

Conflicts:
	Changelog
	configure
	doc/developer.texi
	libavcodec/libvpxenc.c
	libavcodec/rawdec.c
	libavfilter/x86/gradfun.c
	libavformat/Makefile
	libavformat/isom.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-26 00:14:04 +02:00
doc Merge remote-tracking branch 'qatar/release/0.7' into release/0.8 2011-07-26 00:14:04 +02:00
ffpresets presets: forgotten libvpx presets 2011-06-21 17:52:16 +02:00
libavcodec Merge remote-tracking branch 'qatar/release/0.7' into release/0.8 2011-07-26 00:14:04 +02:00
libavdevice alsa: support unsigned variants of already supported signed formats. 2011-06-23 09:50:52 +02:00
libavfilter Merge remote-tracking branch 'qatar/release/0.7' into release/0.8 2011-07-26 00:14:04 +02:00
libavformat Merge remote-tracking branch 'qatar/release/0.7' into release/0.8 2011-07-26 00:14:04 +02:00
libavutil Merge remote-tracking branch 'qatar/release/0.7' into release/0.8 2011-07-26 00:14:04 +02:00
libpostproc postprocess: Remove test for impossible condition (was: Re: postprocess.c: replace check for p==NULL with *p==0) 2011-06-02 14:43:14 +02:00
libswscale Merge remote-tracking branch 'qatar/release/0.7' into release/0.8 2011-07-26 00:14:04 +02:00
mt-work Update todo 2011-06-12 18:01:29 +02:00
tests error_resilience: actually add counter when adding a MV predictor. 2011-06-20 22:18:23 +02:00
tools showfiltfmts: use av_get_pix_fmt_name() 2011-06-07 12:44:51 +02:00
.gitignore Merge remote-tracking branch 'qatar/master' 2011-05-20 05:48:22 +02:00
Changelog Merge remote-tracking branch 'qatar/release/0.7' into release/0.8 2011-07-26 00:14:04 +02:00
cmdutils_common_opts.h cmdutils: remove OPT_FUNC2 2011-05-28 18:23:05 +02:00
cmdutils.c cmdutils: remove outcommented merge trash 2011-06-20 13:22:23 +02:00
cmdutils.h lavfi: add vsink_buffer, and use it in ff* tools 2011-06-19 19:18:33 +02:00
common.mak Merge remote-tracking branch 'qatar/master' 2011-06-15 02:15:25 +02:00
configure Merge remote-tracking branch 'qatar/release/0.7' into release/0.8 2011-07-26 00:14:04 +02: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 Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1. 2009-06-05 09:51:31 +00: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
Doxyfile Merge remote-tracking branch 'qatar/release/0.7' into release/0.8 2011-07-26 00:14:04 +02:00
ffmpeg.c Merge remote-tracking branch 'qatar/release/0.7' into release/0.8 2011-07-26 00:14:04 +02:00
ffplay.c ffplay: use new avformat_open_* API. 2011-06-22 20:20:41 +02:00
ffprobe.c Fix segmentation fault in ffprobe 2011-07-03 19:49:54 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2011-06-18 05:10:38 +02:00
ffserver.h
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
LICENSE Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
MAINTAINERS add MicroDVD muxer and demuxer 2011-04-04 01:29:40 +02:00
Makefile Merge remote-tracking branch 'qatar/release/0.7' into release/0.8 2011-07-26 00:14:04 +02:00
README Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
RELEASE Update RELEASE file 2011-07-12 18:31:28 +02:00
subdir.mak Merge remote-tracking branch 'qatar/master' 2011-06-04 06:35:17 +02:00
VERSION set for next release of 0.8 2011-06-22 20:24:02 +02:00
version.sh Merge remote-tracking branch 'qatar/master' 2011-06-20 04:07:34 +02:00

README 

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.