ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-23 06:46:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
57,676 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%
78265fcfee
Go to file
Michael Niedermayer 78265fcfee Merge commit '28096e0a806e57376541e6222d315619906e3c55' 
* commit '28096e0a806e57376541e6222d315619906e3c55':
  h264: wait for initial complete frame before outputing frames

Conflicts:
	doc/APIchanges
	libavcodec/h264.c
	libavcodec/mpegvideo.h
	libavutil/frame.h
	libavutil/version.h

See: a64b028aeb (as well as various later commits)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 12:59:08 +01:00
compat
doc Merge commit '28096e0a806e57376541e6222d315619906e3c55' 2013-11-01 12:59:08 +01:00
libavcodec Merge commit '28096e0a806e57376541e6222d315619906e3c55' 2013-11-01 12:59:08 +01:00
libavdevice timefilter: Handle memory allocation failure 2013-10-29 11:40:04 +00:00
libavfilter Merge commit 'ed1a11ed52bbd1f15bb9b0416d69b7924bee3191' 2013-11-01 10:26:49 +01:00
libavformat Merge commit '9af7a8523a6bb517834ebed36093bdab11a8b38e' 2013-11-01 10:46:39 +01:00
libavresample Merge commit '211ca69b13eb0a127a9ef7e70ddaccdab125d1c5' 2013-10-28 09:59:53 +01:00
libavutil Merge commit '28096e0a806e57376541e6222d315619906e3c55' 2013-11-01 12:59:08 +01:00
libpostproc
libswresample
libswscale Optimize pure C unscaled yuv2rgb. 2013-10-30 20:52:24 +01:00
presets
tests tests/fate: fix fate on branches different from origin/master 2013-10-29 21:53:59 +01:00
tools
.gitignore
arch.mak
Changelog Merge commit '9af7a8523a6bb517834ebed36093bdab11a8b38e' 2013-11-01 10:46:39 +01:00
cmdutils_common_opts.h cmdutils: add -colors option 2013-10-27 09:18:45 +01:00
cmdutils.c cmdutils: fix expected signature for show_colors() function 2013-10-28 09:41:25 +01:00
cmdutils.h cmdutils: fix expected signature for show_colors() function 2013-10-28 09:41:25 +01:00
common.mak
configure Merge commit 'e78913052263af80855590659fb0f705e8f13c8a' 2013-10-29 19:50:03 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c ffmpeg_filter: Fix non jpeg yuv in jpeg support 2013-10-27 17:41:06 +01:00
ffmpeg_opt.c
ffmpeg.c Merge commit 'c872d310cd9c605e5f994ad8ac79dc72303c0d29' 2013-10-29 21:38:53 +01:00
ffmpeg.h Merge commit 'c872d310cd9c605e5f994ad8ac79dc72303c0d29' 2013-10-29 21:38:53 +01:00
ffplay.c ffplay: add support for libswresample options 2013-10-26 12:23:54 +02:00
ffprobe.c
ffserver.c
INSTALL
library.mak build: remove pointless condition 2013-10-29 14:00:29 +00:00
LICENSE libavfilter/vf_noise: relicense to LGPL 2013-10-27 20:29:07 +00:00
MAINTAINERS MAINTAINERS: add myself as libzvbi-teletextdec maintainer 2013-10-31 21:31:52 +01:00
Makefile build: Ensure that strip commands are run silently 2013-10-31 11:48:59 +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.