FFmpeg git repo
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
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
presets
tests fate: Overhaul WavPack coverage 2012-02-25 01:06:19 +01:00
tools
.gitignore Remove libpostproc. 2012-02-23 19:36:16 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Changelog Remove libpostproc. 2012-02-23 19:36:16 +01:00
Doxyfile
INSTALL
LICENSE Remove libpostproc. 2012-02-23 19:36:16 +01:00
MAINTAINERS
Makefile Remove libpostproc. 2012-02-23 19:36:16 +01:00
README
RELEASE
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
cmdutils_common_opts.h cmdutils: add -cpuflags. 2012-02-19 21:17:25 +01:00
common.mak
configure Merge remote-tracking branch 'qatar/master' 2012-02-24 02:57:18 +01:00
ffmpeg.c Add missing av_free_packet. 2012-02-20 21:23:00 +01:00
ffplay.c
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
library.mak
version.sh

README

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.