1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Go to file
Michael Niedermayer bd9de4f594 Merge remote-tracking branch 'cus/stable'
* cus/stable:
  ffmpeg: ensure that -fix_sub_duration doesnt create subtitles with zero duration
  ffmpeg: free empty subtitles as well in transcode_subtitles
  ffmpeg: do not pass possibly undefined subtitles to sub2video_update

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-30 05:07:19 +01:00
compat
doc doc/ffserver: specify missing argument for ACL feed option 2013-11-29 10:28:03 +01:00
libavcodec Merge remote-tracking branch 'qatar/master' 2013-11-30 04:49:54 +01:00
libavdevice
libavfilter
libavformat mxfdec: set extradata size 2013-11-29 14:19:47 +01:00
libavresample
libavutil
libpostproc
libswresample
libswscale
presets
tests
tools
.gitignore
arch.mak
Changelog
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure configure: remove code that disables striping in the absence of some flags 2013-11-28 21:35:12 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg_vdpau.c
ffmpeg.c ffmpeg: ensure that -fix_sub_duration doesnt create subtitles with zero duration 2013-11-28 21:30:03 +01:00
ffmpeg.h
ffplay.c
ffprobe.c
ffserver.c ffserver: improve error feedback in case of write_header() failure 2013-11-29 12:11:39 +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
README
RELEASE RELEASE: update to 2.1.git 2013-11-29 16:41:42 +01:00
version.sh

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.