ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-23 14:56:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
61,133 Commits 36 Branches 398 Tags 536 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
5a4852bc4d
Go to file
Michael Niedermayer 5a4852bc4d Merge commit '570af382eea902afe09f3562e5e1b483981cca7e' 
* commit '570af382eea902afe09f3562e5e1b483981cca7e':
  mxf: Handle identification metadata

Conflicts:
	libavformat/mxfdec.c

See: 25b143aa7b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-06 22:59:35 +01:00
compat Correct the FSF address for two avisynth files to '51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA' 2014-03-06 20:44:33 +01:00
doc Fix spelling errors in texi files: accomodate -> accommodate allows to -> allows one to choosen -> chosen compability -> compatibility explictly -> explicitly overriden -> overridden specifed -> specified Trasmission -> Transmission 2014-03-06 21:12:40 +01:00
libavcodec Merge commit 'd48430c367947a64647c6959cf472f2c01778b17' 2014-03-06 22:04:51 +01:00
libavdevice lavd/Makefile: Add fbdev_common.h to SKIPHEADERS 2014-03-06 15:42:15 +01:00
libavfilter avfilter/vf_shuffleplanes: Fix flags / add AV_OPT_FLAG_FILTERING_PARAM 2014-03-06 16:58:24 +01:00
libavformat Merge commit '570af382eea902afe09f3562e5e1b483981cca7e' 2014-03-06 22:59:35 +01:00
libavresample
libavutil Revert "lavu/buffer: add release function" 2014-03-06 03:23:40 +01:00
libpostproc
libswresample
libswscale
presets
tests Merge commit 'e1f2987b10112489f6da5501d4c8735a798c9e3f' 2014-03-06 13:09:06 +01:00
tools Merge commit 'ea7f79f93796d68559a495be824b6bbd94dfe5f6' 2014-03-01 14:44:58 +01:00
.gitignore
arch.mak
Changelog Merge commit '599b81ca9a8e04a27ddad94af462171d16063167' 2014-03-06 13:07:20 +01:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c
cmdutils.h
common.mak
configure Merge commit 'd48430c367947a64647c6959cf472f2c01778b17' 2014-03-06 22:04:51 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg_vdpau.c
ffmpeg.c ffmpeg: dont try to run the subtitle encoder on non subtitle streams 2014-03-03 21:06:24 +01:00
ffmpeg.h
ffplay.c
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS update for 2.2 2014-03-01 03:34:59 +01:00
Makefile
README
RELEASE RELEASE: update for 2.2 2014-03-01 17:09:12 +01:00
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.