1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Go to file
Michael Niedermayer b008ac18bb Merge remote-tracking branch 'qatar/master'
* qatar/master:
  docs: use -bsf:[vas] instead of -[vas]bsf.
  mpegaudiodec: Prevent premature clipping of mp3 input buffer.
  lavf: move the packet keyframe setting code.
  oggenc: free comment header for all codecs
  lcl: error out if uncompressed input buffer is smaller than framesize.
  mjpeg: abort decoding if packet is too large.
  golomb: use HAVE_BITS_REMAINING() macro to prevent infloop on EOF.
  get_bits: add HAVE_BITS_REMAINING macro.
  lavf/output-example: use new audio encoding API correctly.
  lavf/output-example: more proper usage of the new API.
  tiff: Prevent overreads in the type_sizes array.
  tiff: Make the TIFF_LONG and TIFF_SHORT types unsigned.
  apetag: do not leak memory if avio_read() fails
  apetag: propagate errors.
  SBR DSP x86: implement SSE sbr_hf_g_filt
  SBR DSP x86: implement SSE sbr_sum_square_sse
  SBR DSP: use intptr_t for the ixh parameter.

Conflicts:
	doc/bitstream_filters.texi
	doc/examples/muxing.c
	doc/ffmpeg.texi
	libavcodec/golomb.h
	libavcodec/x86/Makefile
	libavformat/oggenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-25 04:00:43 +01:00
doc Merge remote-tracking branch 'qatar/master' 2012-02-25 04:00:43 +01:00
ffpresets Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2012-02-25 04:00:43 +01:00
libavdevice lavd/lavfi: support all sample formats. 2012-02-22 11:37:32 +01:00
libavfilter avfiltergraph: avoid harmful auto audio conversions. 2012-02-23 09:37:11 +01:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-02-25 04:00:43 +01:00
libavutil random_seed: add selftest 2012-02-23 23:44:38 +01:00
libpostproc Remove libpostproc. 2012-02-23 19:36:16 +01:00
libswresample libswr: allow to set custom matrices. 2012-02-20 20:46:35 +01:00
libswscale Merge remote-tracking branch 'qatar/master' 2012-02-24 02:57:18 +01:00
mt-work Update todo 2011-06-12 18:01:29 +02:00
presets Remove redundant libx264 preset files 2011-10-22 01:32:10 +02:00
tests fate: Overhaul WavPack coverage 2012-02-25 01:06:19 +01:00
tools Fix "ouput" typo and add a check. 2012-01-28 11:04:19 +01:00
.gitignore Remove libpostproc. 2012-02-23 19:36:16 +01:00
Changelog Remove libpostproc. 2012-02-23 19:36:16 +01:00
cmdutils_common_opts.h cmdutils: add -cpuflags. 2012-02-19 21:17:25 +01:00
cmdutils.c Remove libpostproc. 2012-02-23 19:36:16 +01:00
cmdutils.h cmdutils: add -cpuflags. 2012-02-19 21:17:25 +01:00
common.mak Add coverage support. 2011-12-05 20:04:48 +01:00
configure Merge remote-tracking branch 'qatar/master' 2012-02-24 02:57:18 +01: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 cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01: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 remove avconv from Doxyfile 2012-01-25 22:47:45 +01:00
ffmpeg.c Add missing av_free_packet. 2012-02-20 21:23:00 +01:00
ffplay.c Merge remote-tracking branch 'qatar/master' 2012-02-07 01:40:29 +01:00
ffprobe.c Merge remote-tracking branch 'qatar/master' 2012-02-22 02:24:18 +01:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2012-02-22 02:24:18 +01:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
library.mak Merge remote-tracking branch 'qatar/master' 2011-12-18 03:04:44 +01:00
LICENSE Remove libpostproc. 2012-02-23 19:36:16 +01:00
MAINTAINERS maintainers: add myself for recent works. 2012-01-24 16:07:53 +01:00
Makefile Remove libpostproc. 2012-02-23 19:36:16 +01:00
README cosmetics: fix dashed line length after 070c5d0 2011-03-28 09:53:40 +02:00
RELEASE Merge remote-tracking branch 'qatar/master' 2012-01-21 23:11:27 +01: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.