Go to file
Michael Niedermayer 355cea8ddc Merge remote-tracking branch 'cus/stable'
* cus/stable:
  libzvbi-teletextdec: propagate errors generated in page handler
  libzvbi-teletextdec: dont ignore memory allocation error silently
  libzvbi-teletextdec: output ass subtitles instead of plain text
  ass: move text_event_to_ass from textdec.c to ass.c and export it
  ass: fix error handling in ff_ass_add_subrect
  ass: factor out ff_ass_bprint_dialog
  libzvbi-teletextdec: use AVBPrint for whitespace cleanup
  libzvbi-teletextdec: use option constants instead of strings
  libzvbi-teletextdec: fix indentation after last commit
  libzvbi-teletextdec: support multiple teletext pages in a single packet

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-11 22:29:48 +01:00
compat Merge remote-tracking branch 'qatar/master' 2013-11-07 23:39:31 +01:00
doc doc: delete viterbi.txt 2013-11-11 10:45:19 +01:00
libavcodec Merge remote-tracking branch 'cus/stable' 2013-11-11 22:29:48 +01:00
libavdevice
libavfilter avfilter/fade: use FADE_OUT macro. 2013-11-10 19:16:45 +01:00
libavformat avformat/electronicarts: check chunksize more completely in probe() 2013-11-11 21:31:56 +01:00
libavresample
libavutil avutil/common: error out with clear message if __STDC_CONSTANT_MACROS is not defined with c++ 2013-11-05 22:10:02 +01:00
libpostproc
libswresample
libswscale lsws/utils: introduce scale_algorithms array 2013-11-05 14:01:53 +01:00
presets
tests
tools tools/probetest: also print the time the probe functions needed 2013-11-08 22:33:52 +01:00
.gitignore doc/examples: rename demuxing to demuxing_decoding. 2013-11-04 12:53:06 +01:00
arch.mak
Changelog
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure build: avoid stdin stall with GNU AS probing. 2013-11-09 12:38:12 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c ffmpeg: generate more specific error message in case of inconsistent filtering options 2013-11-09 19:05:35 +01:00
ffmpeg.c ffmpeg: remove unneeded include "libswscale/swscale.h" 2013-11-10 21:45:19 +01:00
ffmpeg.h ffmpeg: store value of -filter and -filter_script per-stream option in OutputStream struct 2013-11-09 19:05:34 +01:00
ffplay.c ffplay: add smarter method for determining video picture duration 2013-11-05 21:27:07 +01:00
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS
Makefile
README
RELEASE
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.