RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-25 16:52:31 +00:00
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
32,531 Commits 37 Branches 400 Tags 244 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
9765caec1b
Go to file
Michael Niedermayer 9765caec1b Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  adpcm: split ADPCM encoders and decoders into separate files.
  doc/avconv: fix typo.
  rv34: check that subsequent slices have the same type as first one.
  smacker demuxer: handle possible av_realloc() failure.
  lavfi: add split filter from soc.
  lavfi: add showinfo filter
  libxavs: add private options corresponding to deprecated global options

Conflicts:
	Changelog
	libavcodec/adpcm.c
	libavfilter/avfilter.h
	libavfilter/vf_showinfo.c
	libavfilter/vf_split.c
	libavformat/smacker.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-12 21:01:12 +02:00
doc Merge remote-tracking branch 'qatar/master' 2011-09-12 21:01:12 +02:00
ffpresets Remove libx264 baseline ffpreset 2011-07-28 01:44:57 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2011-09-12 21:01:12 +02:00
libavdevice dshow: indent 2011-09-12 19:22:13 +02:00
libavfilter Merge remote-tracking branch 'qatar/master' 2011-09-12 21:01:12 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2011-09-12 21:01:12 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2011-09-12 00:32:54 +02:00
libpostproc Merge remote-tracking branch 'qatar/master' 2011-07-06 23:57:11 +02:00
libswscale swscale: Fix unused asm and enable it 2011-09-05 18:42:44 +02:00
mt-work Update todo 2011-06-12 18:01:29 +02:00
tests Merge remote-tracking branch 'qatar/master' 2011-09-12 00:32:54 +02:00
tools Merge remote-tracking branch 'qatar/master' 2011-08-26 23:18:54 +02:00
.gitignore gitignore: ignore .exp files, as generated by the MS linker on win32 2011-09-12 18:17:43 +02:00
avconv.c Merge remote-tracking branch 'qatar/master' 2011-09-12 00:32:54 +02:00
Changelog lavfi: add split filter from soc. 2011-09-12 08:48:16 +02:00
cmdutils_common_opts.h Merge remote-tracking branch 'qatar/master' 2011-09-12 00:32:54 +02:00
cmdutils.c Merge remote-tracking branch 'qatar/master' 2011-09-12 00:32:54 +02:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2011-09-12 00:32:54 +02:00
common.mak Merge remote-tracking branch 'qatar/master' 2011-08-15 23:35:53 +02:00
configure libspeex encoder wraper 2011-09-11 04:07:08 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile doxygen: dont generate docs for avconv.c 2011-09-08 17:56:17 +02:00
ffmpeg.c ffmpeg: remove unused data_codec_name. 2011-09-12 12:09:09 +02:00
ffplay.c lavfi: rename vsink_buffer.c to sink_buffer.c, and vsink_buffer.h to buffersink.h 2011-09-06 18:51:09 +02:00
ffprobe.c ffprobe: replace specific ## GNU cpp extension with __VA_ARGS__. 2011-09-09 14:40:18 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2011-09-05 03:10:45 +02:00
INSTALL
LICENSE
MAINTAINERS MAINTAINERS: add a "Releases" section 2011-06-24 11:15:26 +02:00
Makefile build: fix install rule with --progs-suffix. 2011-09-11 01:48:29 +02:00
README
RELEASE set Release to 0.8.2.git. We are at 0.8.2 and a bit further. 2011-08-13 03:39:58 +02:00
subdir.mak Merge remote-tracking branch 'qatar/master' 2011-07-31 00:34:47 +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.