1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-07 11:13:41 +02:00
Go to file
Michael Niedermayer 1fd323f31e Merge commit 'fa4476815d0d27996eb199452f2cdbfccdd244a5'
* commit 'fa4476815d0d27996eb199452f2cdbfccdd244a5':
  ljpegenc: split bgr encoding into a separate function

Conflicts:
	libavcodec/ljpegenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06 13:55:37 +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 'fa4476815d0d27996eb199452f2cdbfccdd244a5' 2013-12-06 13:55:37 +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
tests Merge commit '58a868968df445068a143f327ced03b6a02baf0d' 2013-12-06 04:03:05 +01:00
tools
.gitignore Merge commit '3cd612d44789948f72b52944474e0870c5c60964' 2013-12-01 21:18:11 +01:00
arch.mak
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
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
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
library.mak Add Windows resource file support for shared libraries 2013-12-05 23:42:07 +01:00
LICENSE
MAINTAINERS
Makefile Add Windows resource file support for shared libraries 2013-12-05 23:42:07 +01:00
README
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

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.