ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-22 14:26:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,044 Commits 36 Branches 398 Tags 535 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
be2e211dce
Go to file
Michael Niedermayer be2e211dce Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  doxy: remove reference to removed api
  examples: unbreak compilation
  ttadec: cosmetics: reindent
  sunrast: use RLE trigger macro inplace of the hard coded value.
  sunrastenc: set keyframe flag for the output packet.
  mpegvideo_enc: switch to encode2().
  mpegvideo_enc: force encoding delay of at least 1 frame when low_delay=0

Conflicts:
	doc/examples/muxing.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-20 01:29:30 +01:00
doc Merge remote-tracking branch 'qatar/master' 2012-02-20 01:29:30 +01:00
ffpresets Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2012-02-20 01:29:30 +01:00
libavdevice dshow_filter: fix compilation with mingw-w64 2012-02-16 23:25:59 +01:00
libavfilter lavfi/aspect: set default value to 0:1, as stated in the docs 2012-02-18 11:41:53 +01:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-02-20 01:29:30 +01:00
libavutil audioconvert: consistent use of FF_ARRAY_ELEMS for channel_layout_map. 2012-02-15 10:26:25 +01:00
libpostproc build: Allow building old API/ABI libpostproc version 2012-01-24 17:01:10 +01:00
libswresample libswresample: introduce int swr_set_compensation() instead of void swr_compensate() 2012-01-09 04:16:06 +01:00
libswscale Merge remote-tracking branch 'qatar/master' 2012-02-18 02:20:19 +01:00
mt-work
presets Remove redundant libx264 preset files 2011-10-22 01:32:10 +02:00
tests Merge remote-tracking branch 'qatar/master' 2012-02-19 01:47:10 +01:00
tools Fix "ouput" typo and add a check. 2012-01-28 11:04:19 +01:00
.gitignore Merge remote-tracking branch 'qatar/master' 2012-01-26 02:23:56 +01:00
Changelog Merge remote-tracking branch 'qatar/master' 2012-02-18 02:20:19 +01:00
cmdutils_common_opts.h cmdutils: add -cpuflags. 2012-02-19 21:17:25 +01:00
cmdutils.c cmdutils: add -cpuflags. 2012-02-19 21:17:25 +01:00
cmdutils.h cmdutils: add -cpuflags. 2012-02-19 21:17:25 +01:00
common.mak Add coverage support. 2011-12-05 20:04:48 +01:00
configure Add muxer test based on stream-copy from FATE sample. 2012-02-18 16:41:39 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1 cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
COPYING.LGPLv3
CREDITS
Doxyfile remove avconv from Doxyfile 2012-01-25 22:47:45 +01:00
ffmpeg.c ffmpeg: Fix setting flags for codec copy. 2012-02-18 14:34:16 +01:00
ffplay.c Merge remote-tracking branch 'qatar/master' 2012-02-07 01:40:29 +01:00
ffprobe.c ffprobe: fix crash if the file can't be opened. 2012-02-18 21:35:09 +01:00
ffserver.c ffserver: use avcodec_get_context_defaults3() 2012-02-07 05:51:31 +01:00
INSTALL
library.mak Merge remote-tracking branch 'qatar/master' 2011-12-18 03:04:44 +01:00
LICENSE
MAINTAINERS maintainers: add myself for recent works. 2012-01-24 16:07:53 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-02-04 02:34:14 +01:00
README
RELEASE Merge remote-tracking branch 'qatar/master' 2012-01-21 23:11:27 +01:00
version.sh

README 

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.