dsg/ffmpeg
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
No description
48039 commits 2 branches 415 tags 214 MiB
Find a file
Michael Niedermayer 40ea343866 Merge commit 'c661cb6672' 
* commit 'c661cb6672':
  cmdutils: pass number of groups to split_commandline().
  mov: handle h263 and flv1 for codec_tag 'H','2','6','3'
  h264: fix sps parsing for SVC and CAVLC 4:4:4 Intra profiles

Conflicts:
	libavcodec/h264_ps.c
	libavformat/isom.c
	libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-20 12:06:15 +01:00
compat
doc doc/general: sort subtitles formats. 2012-12-20 03:55:16 +01:00
libavcodec Merge commit 'c661cb6672' 2012-12-20 12:06:15 +01:00
libavdevice dshow: call CoUninitialize() on dshow_read_close() 2012-12-17 03:44:51 -02:00
libavfilter lavfi/select: fix compilation with avcodec disabled. 2012-12-20 05:17:36 +01:00
libavformat Merge commit 'c661cb6672' 2012-12-20 12:06:15 +01:00
libavresample Merge remote-tracking branch 'qatar/master' 2012-12-17 14:11:51 +01:00
libavutil Merge remote-tracking branch 'qatar/master' 2012-12-20 02:51:35 +01:00
libpostproc pp: fix a few typo in the template. 2012-12-19 17:59:25 +01:00
libswresample swr/doxy: fix missing quote in code example. 2012-12-16 21:04:54 +01:00
libswscale doxy: add ref for lavfi, lpp and lsws. 2012-12-11 02:13:43 +01:00
presets
tests fate: add and fix subtitles dependencies. 2012-12-20 03:50:34 +01:00
tools Fix "bistream" typo and add a check in tools/patcheck. 2012-12-18 02:47:34 +01:00
.gitignore
arch.mak
Changelog Merge commit 'acb571c89a' 2012-12-20 02:44:22 +01:00
cmdutils.c Merge commit 'c661cb6672' 2012-12-20 12:06:15 +01:00
cmdutils.h Merge commit 'c661cb6672' 2012-12-20 12:06:15 +01:00
cmdutils_common_opts.h cmdutils: implement debug/fdebug log level update differently. 2012-12-20 02:38:18 +01:00
common.mak Merge remote-tracking branch 'qatar/master' 2012-12-11 08:24:45 +01:00
configure Merge remote-tracking branch 'qatar/master' 2012-12-18 15:00:05 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg.c Merge commit '77bd1bc73a' 2012-12-20 02:38:02 +01:00
ffmpeg.h Merge commit '77bd1bc73a' 2012-12-20 02:38:02 +01:00
ffmpeg_filter.c Merge commit '10bca66101' 2012-12-19 22:04:03 +01:00
ffmpeg_opt.c Merge commit 'c661cb6672' 2012-12-20 12:06:15 +01:00
ffplay.c ffplay: provide some feedback in case the codec cannot be set 2012-12-16 10:58:02 +01:00
ffprobe.c ffprobe: show pkt_size in frame 2012-12-15 11:46:47 +01:00
ffserver.c ffserver: set oformat 2012-12-09 23:39:06 +01:00
INSTALL
library.mak Merge remote-tracking branch 'qatar/master' 2012-12-11 08:24:45 +01:00
LICENSE
MAINTAINERS MAINTAINERS: update my GPG key fingerprint 2012-12-18 23:08:02 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-12-11 08:24:45 +01:00
README
RELEASE
version.sh

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.