ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-23 23:06:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,541 Commits 36 Branches 398 Tags 538 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
291b220377
Go to file
Michael Niedermayer 291b220377 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avconv: flush filtered frames before reconfiguring filters
  mov: stsd entries must be at least 16 byte
  mov: detect EOF in mov_read_dref()
  file: return proper error on seek failures

Conflicts:
	libavformat/file.c
	libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-17 15:15:43 +02:00
compat compat/vsnprintf: return number of bytes required on truncation. 2012-09-15 19:46:54 -04:00
doc Mentioning 8bps once in the FFmpeg documentation is sufficient. 2012-09-16 16:31:33 +02:00
libavcodec arm/dca: Fix compilation of decode_blockcodes() with --enable-thumb 2012-09-16 19:06:11 +02:00
libavdevice lavd/lavfi: apply stylistic fixes to the options help fields 2012-09-11 22:56:35 +02:00
libavfilter lavfi/ass: mark ass_libavfilter_log_level_map as static const. 2012-09-16 02:59:43 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-09-17 15:15:43 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2012-09-14 14:13:38 +02:00
libavutil fate: add av_small_strptime() test to fate-parseutils 2012-09-17 12:46:55 +02:00
libpostproc postproc: Fix unprotected inline asm 2012-09-11 20:12:14 +02:00
libswresample swr/resample: mark mm_flags as potentially unused 2012-09-13 19:31:02 +02:00
libswscale sws: revert: "swscale: Remove two bogus asserts" 2012-09-13 15:53:05 +02:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests fate: add av_small_strptime() test to fate-parseutils 2012-09-17 12:46:55 +02:00
tools Remove mt-work directory 2012-09-15 15:40:36 -04:00
.gitignore gitignore: codec_names.h is no more 2012-09-07 14:59:01 +02:00
arch.mak Optimization of AMR NB and WB decoders for MIPS 2012-06-11 21:12:39 +02:00
Changelog Merge commit '07584eaf4a95db3f11d3bc411f9786932829e82b' 2012-09-13 15:22:16 +02:00
cmdutils_common_opts.h cmdutils: add -layouts option. 2012-08-28 15:09:49 +02:00
cmdutils.c msvc: Add a va_copy compatability macro for msvc 2012-09-15 19:46:48 -04: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 msvc: Disable stripping 2012-09-15 19:44:54 -04: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 cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01: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/master' 2012-08-04 23:51:43 +02:00
ffmpeg_filter.c ffmpeg_filter: fix unsafe snprintf() usage 2012-09-09 14:11:03 +02:00
ffmpeg_opt.c Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5' 2012-08-31 13:01:30 +02:00
ffmpeg.c ffmpeg: use PTS from the AVSubtitle structure for sub2video. 2012-09-15 16:14:33 +02:00
ffmpeg.h ffmpeg: use PTS from the AVSubtitle structure. 2012-09-15 16:14:33 +02:00
ffplay.c ffplay: dont wait 100ms if data is not yet ready 2012-09-16 19:07:28 +02:00
ffprobe.c ffprobe: kill initializers with nested union field definition 2012-09-14 10:47:08 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2012-09-12 11:46:47 +02:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
library.mak Merge remote-tracking branch 'qatar/master' 2012-08-30 17:28:21 +02:00
LICENSE LICENSE: correct incorrect claims on *GPL incompatibility 2012-08-16 04:47:18 +02:00
MAINTAINERS Add CPiA video decoder 2012-08-31 00:24:11 +02:00
Makefile Makefile: remove old codec_names.h on distclean 2012-09-07 14:59:01 +02:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE RELEASE: update, seem this has been forgotten 2012-07-01 21:21:07 +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 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.