generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
58,818 Commits 24 Branches 241 Tags
93947d88f2abdf17d374a2d83cdb051ef9bafb2c
Go to file
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
Michael Niedermayer 93947d88f2 Merge commit '24abd806ea0cfb0d988d2f0044eac79cff12918c' 
* commit '24abd806ea0cfb0d988d2f0044eac79cff12918c':
  ljpegenc: deMpegEncContextize

Conflicts:
	libavcodec/ljpegenc.c
	libavcodec/mpegvideo.h
	libavcodec/mpegvideo_enc.c
	tests/ref/vsynth/vsynth1-ljpeg
	tests/ref/vsynth/vsynth2-ljpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06 13:30:23 +01:00
compat
Merge remote-tracking branch 'qatar/master'
2013-11-24 23:27:32 +01:00
doc
lavfi: add aeval filter
2013-12-06 10:57:26 +01:00
libavcodec
Merge commit '24abd806ea0cfb0d988d2f0044eac79cff12918c'
2013-12-06 13:30:23 +01:00
libavdevice
Add Windows resource file support for shared libraries
2013-12-05 23:42:07 +01:00
libavfilter
lavfi: rename asrc_aevalsrc.c to aeval.c
2013-12-06 10:57:28 +01:00
libavformat
Add Windows resource file support for shared libraries
2013-12-05 23:42:07 +01:00
libavresample
Add Windows resource file support for shared libraries
2013-12-05 23:42:07 +01:00
libavutil
Add Windows resource file support for shared libraries
2013-12-05 23:42:07 +01:00
libpostproc
Add Windows resource file support for shared libraries
2013-12-05 23:42:07 +01:00
libswresample
Add Windows resource file support for shared libraries
2013-12-05 23:42:07 +01:00
libswscale
Add Windows resource file support for shared libraries
2013-12-05 23:42:07 +01:00
presets
presets: specify the codecs.
2012-05-04 18:40:36 +02:00
tests
Merge commit '58a868968df445068a143f327ced03b6a02baf0d'
2013-12-06 04:03:05 +01:00
tools
tools/probetest: also print the time the probe functions needed
2013-11-08 22:33:52 +01:00
.gitignore
Merge commit '3cd612d44789948f72b52944474e0870c5c60964'
2013-12-01 21:18:11 +01:00
arch.mak
Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'
2012-12-08 14:24:16 +01:00
Changelog
lavfi: add aeval filter
2013-12-06 10:57:26 +01:00
cmdutils_common_opts.h
cmdutils: Add -buildconf option.
2013-11-19 22:09:48 +01:00
cmdutils.c
build: rename version.h to libavutil/ffversion.h
2013-11-30 21:42:55 +01:00
cmdutils.h
cmdutils: remove this_year constant, use CONFIG_THIS_YEAR instead
2013-11-26 10:03:32 +01:00
common.mak
Add Windows resource file support for shared libraries
2013-12-05 23:42:07 +01:00
configure
doc: add script to compute texi files dependencies
2013-12-06 10:40:38 +01:00
COPYING.GPLv2
…
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
CREDITS: redirect to Git log, remove current outdated content
2013-01-31 18:02:52 +01:00
ffmpeg_filter.c
Merge remote-tracking branch 'qatar/master'
2013-11-24 05:21:19 +01:00
ffmpeg_opt.c
Merge remote-tracking branch 'qatar/master'
2013-12-04 04:30:46 +01:00
ffmpeg_vdpau.c
Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'
2013-11-23 14:46:48 +01:00
ffmpeg.c
ffmpeg: ensure that -fix_sub_duration doesnt create subtitles with zero duration
2013-11-28 21:30:03 +01:00
ffmpeg.h
Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'
2013-11-23 14:46:48 +01:00
ffplay.c
ffplay: do not call avcodec_register_all() explicitly
2013-11-25 00:03:20 +01:00
ffprobe.c
ffprobe: free shared writer context on exit
2013-12-03 21:27:14 +01:00
ffserver.c
ffserver: print error code description in case of write_header() failure
2013-11-30 14:35:33 +01:00
INSTALL
Merge remote branch 'qatar/master'
2011-04-08 02:50:13 +02:00
library.mak
Add Windows resource file support for shared libraries
2013-12-05 23:42:07 +01:00
LICENSE
libavfilter/vf_noise: relicense to LGPL
2013-10-27 20:29:07 +00:00
MAINTAINERS
MAINTAINERS: Add 1.2 back to the maintained releases
2013-11-12 14:33:54 +01:00
Makefile
Add Windows resource file support for shared libraries
2013-12-05 23:42:07 +01:00
README
README: be a tiny bit more verbose
2012-04-06 10:23:26 +02:00
RELEASE
RELEASE: update to 2.1.git
2013-11-29 16:41:42 +01:00
version.sh
version.sh: add preprocessing guards
2013-11-30 21:42:03 +01: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.
Description
No description provided
Readme 173 MiB
Languages
C 92.1%
Assembly 6%
Makefile 1.2%
C++ 0.3%
Objective-C 0.2%
Other 0.1%