FFmpeg git repo
Go to file
Michael Niedermayer f138c7f993 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  doc/avconv: replace forgotten av by avconv.
  avconv: reset input_ts_offset between files.
  doc/avconv: extend -ss documentation.
  avconv: call flush_encoders() from transcode() directly.
  avconv: fix broken indentation.
  avconv: rescue poor abused limit_filesize global.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-20 15:43:56 +02:00
doc Merge remote-tracking branch 'qatar/master' 2011-08-20 15:43:56 +02:00
ffpresets Remove libx264 baseline ffpreset 2011-07-28 01:44:57 +02:00
libavcodec Fix parser not to clobber has_b_frames when extradata is set. 2011-08-20 12:29:03 +02:00
libavdevice lavdev/lavfi: specify pos in the output packets 2011-08-20 15:00:36 +02:00
libavfilter lavfi: add ashowinfo filter 2011-08-20 15:00:23 +02:00
libavformat Autodetect LOAS in transport streams. 2011-08-20 00:27:54 +02:00
libavutil lavu: add av_get_media_type_string() convenience function 2011-08-20 14:20:25 +02:00
libpostproc Merge remote-tracking branch 'qatar/master' 2011-07-06 23:57:11 +02:00
libswscale Merge remote-tracking branch 'qatar/master' 2011-08-18 10:56:08 +02:00
mt-work
tests Merge remote-tracking branch 'qatar/master' 2011-08-19 00:53:42 +02:00
tools lavfi-showfiltfmts: extend output format for specifying audio data 2011-07-28 10:04:09 +02:00
.gitignore Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925' 2011-08-13 02:56:08 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Changelog lavfi: add ashowinfo filter 2011-08-20 15:00:23 +02:00
Doxyfile Merge remote-tracking branch 'qatar/master' 2011-07-14 20:44:58 +02:00
INSTALL
LICENSE
MAINTAINERS
Makefile Fix NASM include directive 2011-08-15 11:24:35 -07:00
README
RELEASE set Release to 0.8.2.git. We are at 0.8.2 and a bit further. 2011-08-13 03:39:58 +02:00
avconv.c Merge remote-tracking branch 'qatar/master' 2011-08-20 15:43:56 +02:00
cmdutils.c Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925' 2011-08-13 02:56:08 +02:00
cmdutils.h Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925' 2011-08-13 02:56:08 +02:00
cmdutils_common_opts.h
common.mak Merge remote-tracking branch 'qatar/master' 2011-08-15 23:35:53 +02:00
configure af_format: prefer strtok_r() over strsep() 2011-08-16 17:00:57 +02:00
ffmpeg.c Merge remote-tracking branch 'qatar/master' 2011-08-18 10:56:08 +02:00
ffplay.c ffplay: do not erase the content of vfilters 2011-08-17 10:29:34 +02:00
ffprobe.c ffprobe: use av_get_media_type_string() in media_type_string(), simplify 2011-08-20 14:20:25 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2011-07-15 17:51:09 +02:00
subdir.mak Merge remote-tracking branch 'qatar/master' 2011-07-31 00:34:47 +02:00
version.sh version.sh: handle shallow clones and snapshots. 2011-07-22 10:43:59 +02:00

README

FFmpeg README
-------------

1) Documentation
----------------

* Read the documentation in the doc/ directory.

2) Licensing
------------

* See the LICENSE file.