1
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-09-16 11:54:09 +02:00
Go to file
Michael Niedermayer 4defa68fe2 Merge remote branch 'qatar/master'
* qatar/master:
  ac3enc: ARM optimised ac3_compute_matissa_size
  ac3: armv6 optimised bit_alloc_calc_bap
  fate: simplify fft test rules
  avio: document avio_alloc_context.
  lavf: make compute_chapters_end less picky.
  sierravmd: fix Indeo3 videos
  FFT: simplify fft8()
  fate: add fixed-point fft/mdct tests
  Fixed-point support in fft-test
  ape: check that number of seektable entries is equal to number of frames

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-02 01:54:27 +02:00
doc Match the documentation of -s with the current implementation. 2011-04-02 00:25:57 +02:00
ffpresets Update qmin/qmax values for libx264 presets 2011-02-08 15:59:30 -08:00
libavcodec Merge remote branch 'qatar/master' 2011-04-02 01:54:27 +02:00
libavdevice ALSA: fix a stupid bad use of av_freep. 2011-03-31 18:49:07 +02:00
libavfilter graphparser: add a NULL check on the argument passed to strstr 2011-03-30 22:16:08 +02:00
libavformat Merge remote branch 'qatar/master' 2011-04-02 01:54:27 +02:00
libavutil Fix apparently exploitable race condition. 2011-03-25 02:24:32 +01:00
libpostproc Merge remote-tracking branch 'newdev/master' 2011-03-19 20:05:11 +01:00
libswscale Fix typo from e3a84542. 2011-03-30 20:28:03 +02:00
mt-work Merge remote-tracking branch 'ffmpeg-mt/master' 2011-03-30 02:58:38 +02:00
tests Merge remote branch 'qatar/master' 2011-04-02 01:54:27 +02:00
tools Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
.gitignore consolidate .gitignore patters into a single file 2011-01-18 21:32:05 +01:00
Changelog DPX image encoder 2011-04-01 23:10:26 +11:00
cmdutils_common_opts.h Implement a -pix_fmts option for listing all the supported pixel 2009-12-21 21:53:03 +00:00
cmdutils.c cmdutils: remove list_fmts(), simplify 2011-03-26 14:40:30 +01:00
cmdutils.h cmdutils: remove list_fmts(), simplify 2011-03-26 14:40:30 +01:00
common.mak Merge remote-tracking branch 'newdev/master' 2011-04-01 02:58:15 +02:00
configure Fix compilation with --disable-vdpau 2011-04-02 00:50:39 +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 Merge remote-tracking branch 'newdev/master' 2011-03-19 20:05:11 +01:00
ffmpeg.c Another aspect ratio fix try. This leaves the setdar addition at the end (preferred by people). 2011-04-01 17:38:29 +02:00
ffplay.c ffplay: Don't assume ic->pb is non-null 2011-03-21 15:08:09 -04:00
ffprobe.c ffprobe: provide format parameters to av_open_input_file() 2011-03-26 14:41:51 +01:00
ffserver.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
ffserver.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
INSTALL Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
LICENSE cosmetics: fix dashed line length after 070c5d0 2011-03-28 09:53:40 +02:00
MAINTAINERS Add crystalhd maintainer 2011-03-29 02:27:13 +02:00
Makefile Revert "Remove support for stripping executables" 2011-04-01 00:24:12 +02:00
README cosmetics: fix dashed line length after 070c5d0 2011-03-28 09:53:40 +02:00
subdir.mak Revert "Remove support for stripping executables" 2011-04-01 00:24:12 +02:00
version.sh Merge remote-tracking branch 'newdev/master' 2011-03-19 20:05:11 +01:00

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.