1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Go to file
Michael Niedermayer 93869d4e44 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  libx264: introduce slice-max-size option
  Fixed size given to init_get_bits().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-16 21:43:56 +02:00
doc lavdev/lavfi: add audio support 2011-09-16 21:22:05 +02:00
ffpresets Remove libx264 baseline ffpreset 2011-07-28 01:44:57 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2011-09-16 21:43:56 +02:00
libavdevice lavdev/lavfi: reindent after the last commit 2011-09-16 21:22:11 +02:00
libavfilter lavfi: refactor query_formats and auto-insert audio conversion filters 2011-09-16 20:44:27 +02:00
libavformat lavf/utils: rewrite real fps calculation code. 2011-09-16 21:29:58 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2011-09-12 00:32:54 +02:00
libpostproc postprocess.c: filter name needs to be double 0 terminated 2011-08-26 20:28:54 +02:00
libswscale Merge remote-tracking branch 'qatar/master' 2011-09-15 23:10:26 +02:00
mt-work Update todo 2011-06-12 18:01:29 +02:00
tests lavf/utils: rewrite real fps calculation code. 2011-09-16 21:29:58 +02:00
tools Merge remote-tracking branch 'hexene/scratchpad' 2011-09-14 17:46:49 +02:00
.gitignore gitignore: ignore .exp files, as generated by the MS linker on win32 2011-09-12 18:17:43 +02:00
avconv.c Merge remote-tracking branch 'qatar/master' 2011-09-12 00:32:54 +02:00
Changelog lavdev/lavfi: add audio support 2011-09-16 21:22:05 +02:00
cmdutils_common_opts.h Merge remote-tracking branch 'qatar/master' 2011-09-12 00:32:54 +02:00
cmdutils.c Merge remote-tracking branch 'qatar/master' 2011-09-12 00:32:54 +02:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2011-09-12 00:32:54 +02:00
common.mak Merge remote-tracking branch 'hexene/scratchpad' 2011-09-14 01:23:16 +02:00
configure lavfi: add audio convert filter 2011-09-16 20:44:27 +02:00
COPYING.GPLv2 Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1. 2009-06-05 09:51:31 +00:00
COPYING.GPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
COPYING.LGPLv2.1 Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1. 2009-06-05 09:51:31 +00:00
COPYING.LGPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
CREDITS Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
Doxyfile doxygen: dont generate docs for avconv.c 2011-09-08 17:56:17 +02:00
ffmpeg.c ffmpeg: fix video synchronization code to be exact on constant fps videos. Fixes Ticket137 2011-09-13 17:29:23 +02:00
ffplay.c ffplay: dont drop all frames if realtime decoding is impossible 2011-09-14 14:56:59 +02:00
ffprobe.c ffprobe: fix crash with -h. 2011-09-16 14:31:42 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2011-09-05 03:10:45 +02:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
LICENSE cosmetics: fix dashed line length after 070c5d0 2011-03-28 09:53:40 +02:00
MAINTAINERS MAINTAINERS: add a "Releases" section 2011-06-24 11:15:26 +02:00
Makefile Merge remote-tracking branch 'hexene/scratchpad' 2011-09-14 01:23:16 +02:00
README cosmetics: fix dashed line length after 070c5d0 2011-03-28 09:53:40 +02:00
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
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

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.