virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity
30,012 Commits 38 Branches 406 Tags
b4bcd1e2f1d603419ea9d4fdaab400b1ad35e58c
Go to file
Clone
Open with VS Code Open with VSCodium
Download ZIP Download TAR.GZ Download BUNDLE
Michael Niedermayer b4bcd1e2f1 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Fix compilation of iirfilter-test.
  libx264: handle closed GOP codec flag
  lavf: remove duplicate assignment in avformat_alloc_context.
  lavf: use designated initializers for AVClasses.
  flvdec: clenup debug code
  asfdec: fix possible overread on broken files.
  asfdec: do not fall back to binary/generic search
  asfdec: reindent after previous commit c7bd5ed
  asfdec: fallback to binary search internally
  mpegaudio: add _fixed suffix to some names
  Modify x86util.asm to ease transitioning to 10-bit H.264 assembly.
  dct: build dct32 as separate object files
  qdm2: include correct header for rdft

Conflicts:
	ffpresets/libx264-fast.ffpreset
	ffpresets/libx264-fast_firstpass.ffpreset
	ffpresets/libx264-faster.ffpreset
	ffpresets/libx264-faster_firstpass.ffpreset
	ffpresets/libx264-medium.ffpreset
	ffpresets/libx264-medium_firstpass.ffpreset
	ffpresets/libx264-placebo.ffpreset
	ffpresets/libx264-placebo_firstpass.ffpreset
	ffpresets/libx264-slow.ffpreset
	ffpresets/libx264-slow_firstpass.ffpreset
	ffpresets/libx264-slower.ffpreset
	ffpresets/libx264-slower_firstpass.ffpreset
	ffpresets/libx264-superfast.ffpreset
	ffpresets/libx264-superfast_firstpass.ffpreset
	ffpresets/libx264-ultrafast.ffpreset
	ffpresets/libx264-ultrafast_firstpass.ffpreset
	ffpresets/libx264-veryfast.ffpreset
	ffpresets/libx264-veryfast_firstpass.ffpreset
	ffpresets/libx264-veryslow.ffpreset
	ffpresets/libx264-veryslow_firstpass.ffpreset
	libavformat/flvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-18 05:42:42 +02:00
doc
showinfo: replace "CRC" by "checksum"
2011-05-15 12:28:53 +02:00
ffpresets
Merge remote-tracking branch 'qatar/master'
2011-05-18 05:42:42 +02:00
libavcodec
Merge remote-tracking branch 'qatar/master'
2011-05-18 05:42:42 +02:00
libavdevice
Merge remote branch 'qatar/master'
2011-05-13 04:40:40 +02:00
libavfilter
Add some forgotten const to function arguments in libavfilter & libavformat.
2011-05-17 03:05:36 +02:00
libavformat
Merge remote-tracking branch 'qatar/master'
2011-05-18 05:42:42 +02:00
libavutil
eval: opensolaris strtod() cannot handle 0x1234
2011-05-18 00:01:40 +02:00
libpostproc
Merge remote branch 'qatar/master'
2011-05-09 04:50:56 +02:00
libswscale
swscale: fix compile on mingw32
2011-05-14 13:22:46 +02:00
mt-work
Merge remote-tracking branch 'ffmpeg-mt/master'
2011-03-30 02:58:38 +02:00
tests
iff/8svx: redesign 8SVX demuxing and decoding for handling stereo samples correctly
2011-05-17 00:58:33 +02:00
tools
Merge remote branch 'qatar/master'
2011-05-17 04:51:33 +02:00
.gitignore
consolidate .gitignore patters into a single file
2011-01-18 21:32:05 +01:00
Changelog
update changelog with 9/10 bit H264 and FFV1 changes
2011-05-16 23:30:41 -04:00
cmdutils_common_opts.h
Implement a -pix_fmts option for listing all the supported pixel
2009-12-21 21:53:03 +00:00
cmdutils.c
cmdutils: Allocate private decoder context if its not allocated yet.
2011-05-16 21:26:18 +02:00
cmdutils.h
cmdutils: remove list_fmts(), simplify
2011-05-10 07:14:13 +02:00
common.mak
Merge remote-tracking branch 'newdev/master'
2011-04-01 02:58:15 +02:00
configure
Merge remote-tracking branch 'qatar/master'
2011-05-18 05:42:42 +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 'newdev/master'
2011-03-19 20:05:11 +01:00
ffmpeg.c
ffmpeg: reset top_field_first in opt_input_file().
2011-05-17 16:57:16 +02:00
ffplay.c
ffplay: remove audio_write_get_buf_size() forward declaration
2011-05-16 14:13:03 -07:00
ffprobe.c
ffprobe: tweak error message in open_input_file()
2011-05-12 13:03:10 +02:00
ffserver.c
Merge remote branch 'qatar/master'
2011-05-13 04:40:40 +02:00
ffserver.h
Replace FFmpeg with Libav in licence headers
2011-03-19 13:33:20 +00:00
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
Makefile:Put lost tab back.
2011-05-06 02:21:52 +02:00
README
Revert "partially rename FFmpeg to Libav"
2011-03-17 17:26:45 +01:00
subdir.mak
Revert "Remove support for stripping executables"
2011-04-01 00:24:12 +02:00
version.sh
Merge remote-tracking branch 'newdev/master'
2011-03-19 20:05:11 +01:00

README 

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.
Description
Mirror of https://git.ffmpeg.org/ffmpeg.git
audiocffmpegffthevchlsmatroskamp4mpegmultimediartmprtspstreamingvideowebm
Readme 536 MiB
Languages
C 90.1%
Assembly 7.9%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%