1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Go to file
Michael Niedermayer d43d627a24 Merge commit 'f058f384a0d76bfd125f4738dceab7c890186432'
* commit 'f058f384a0d76bfd125f4738dceab7c890186432':
  configure: Do not use pthread_create to check for pthread

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-30 20:40:59 +01:00
compat Merge remote-tracking branch 'qatar/master' 2013-11-24 23:27:32 +01:00
doc doc/ffserver: clarify documentation for Feed MaxFileSize option 2013-11-30 14:47:26 +01:00
libavcodec avcodec/mpeg4video: fix doxycomments so they are not associated with random unrelated fields 2013-11-30 20:30:11 +01:00
libavdevice lavd/pulse_audio_enc: add buffer size control options 2013-11-27 10:12:54 +01:00
libavfilter lavfi/Makefile: Don't compile lavfutils.c and lswsutils.c if they are not needed 2013-11-30 13:29:27 +01:00
libavformat mxfdec: set extradata size 2013-11-29 14:19:47 +01:00
libavresample Merge remote-tracking branch 'qatar/master' 2013-11-24 05:21:19 +01:00
libavutil avutil/log: check that len is within the buffer before reading it 2013-11-27 17:06:42 +01:00
libpostproc
libswresample
libswscale Merge commit 'c16bfb147df8a9d350e8a0dbc01937b78faf5949' 2013-11-23 12:10:40 +01:00
presets
tests Merge commit '874838dc6589d978611c89a40694a5074f892a76' 2013-11-21 18:49:41 +01:00
tools
.gitignore Add transcode_aac example to .gitignore. 2013-11-28 13:19:50 +01:00
arch.mak
Changelog Merge remote-tracking branch 'qatar/master' 2013-11-26 13:13:45 +01:00
cmdutils_common_opts.h cmdutils: Add -buildconf option. 2013-11-19 22:09:48 +01:00
cmdutils.c Revert "configure: add #include "version.h" to config.h" 2013-11-28 00:19:45 +01:00
cmdutils.h cmdutils: remove this_year constant, use CONFIG_THIS_YEAR instead 2013-11-26 10:03:32 +01:00
common.mak
configure Merge commit 'f058f384a0d76bfd125f4738dceab7c890186432' 2013-11-30 20:40:59 +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 commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea' 2013-11-23 14:46:48 +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 Revert "configure: add #include "version.h" to config.h" 2013-11-28 00:19:45 +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 library.mak: only run asm strip if ASMSTRIP flags are set 2013-11-28 21:52:46 +01:00
LICENSE
MAINTAINERS
Makefile Merge commit 'dc80e2f7a529d6e4416b40b68699be16fed62d6c' 2013-11-27 02:09:16 +01:00
README
RELEASE RELEASE: update to 2.1.git 2013-11-29 16:41:42 +01:00
version.sh version.sh: make it independant of version.h file name 2013-11-30 15:04:24 +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.