No description
Find a file
Michael Niedermayer 7c1aba4f01 Merge remote-tracking branch 'qatar/master'
* qatar/master: (21 commits)
  fate: allow testing with libavfilter disabled
  x86: XOP/FMA4 CPU detection support
  ws_snd: misc cosmetic clean-ups
  ws_snd: remove the 2-bit ADPCM table and just subtract 2 instead.
  ws_snd: use memcpy() and memset() instead of loops
  ws_snd: use samples pointer for loop termination instead of a separate iterator variable.
  ws_snd: make sure number of channels is 1
  ws_snd: add some checks to prevent buffer overread or overwrite.
  ws_snd: decode to AV_SAMPLE_FMT_U8 instead of S16.
  flacdec: fix buffer size checking in get_metadata_size()
  rtp: Simplify ff_rtp_get_payload_type
  rtpenc: Add a payload type private option
  rtp: Correct ff_rtp_get_payload_type documentation
  avconv: replace all fprintf() by av_log().
  avconv: change av_log verbosity from ERROR to FATAL for fatal errors.
  cmdutils: replace fprintf() by av_log()
  avtools: parse loglevel before all the other options.
  oggdec: add support for Xiph's CELT codec
  sol: return error if av_get_packet() fails.
  cosmetics: reindent and pretty-print
  ...

Conflicts:
	avconv.c
	cmdutils.c
	libavcodec/avcodec.h
	libavcodec/version.h
	libavformat/oggparsecelt.c
	libavformat/utils.c
	libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-27 02:14:37 +02:00
doc Merge remote-tracking branch 'qatar/master' 2011-09-27 02:14:37 +02:00
ffpresets remove libx264 lossless presets 2011-09-26 22:04:23 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2011-09-27 02:14:37 +02:00
libavdevice Merge remote-tracking branch 'qatar/master' 2011-09-24 22:39:52 +02:00
libavfilter vf_drawtext: apply misc style fixes 2011-09-25 22:47:51 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2011-09-27 02:14:37 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2011-09-27 02:14:37 +02:00
libpostproc postproc: fix compilation failure, now really 2011-09-24 01:51:35 +02:00
libswresample
libswscale Merge remote-tracking branch 'qatar/master' 2011-09-25 23:30:25 +02:00
mt-work
tests Merge remote-tracking branch 'qatar/master' 2011-09-27 02:14:37 +02:00
tools
.gitignore
avconv.c Merge remote-tracking branch 'qatar/master' 2011-09-27 02:14:37 +02:00
Changelog Merge remote-tracking branch 'qatar/master' 2011-09-27 02:14:37 +02:00
cmdutils.c Merge remote-tracking branch 'qatar/master' 2011-09-27 02:14:37 +02:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2011-09-27 02:14:37 +02:00
cmdutils_common_opts.h
common.mak
configure Merge remote-tracking branch 'qatar/master' 2011-09-27 02:14:37 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg.c Merge remote-tracking branch 'qatar/master' 2011-09-27 02:14:37 +02:00
ffplay.c Merge remote-tracking branch 'qatar/master' 2011-09-27 02:14:37 +02:00
ffprobe.c Merge remote-tracking branch 'qatar/master' 2011-09-27 02:14:37 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2011-09-27 02:14:37 +02:00
INSTALL
LICENSE libaac+ support 2011-09-26 02:28:21 +02:00
MAINTAINERS MAINTAINERS: loose svn reference 2011-09-23 19:18:58 +02:00
Makefile
README
RELEASE
subdir.mak
version.sh

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.