FFmpeg git repo
Go to file
Michael Niedermayer 91eb1b1525 Merge remote-tracking branch 'qatar/master'
* qatar/master: (22 commits)
  prores: add FATE tests
  id3v2: reduce the scope of some non-globally-used symbols/structures
  id3v2: cosmetics: move some declarations before the places they are used
  shorten: remove the flush function.
  shn: do not allow seeking in the raw shn demuxer.
  avformat: add AVInputFormat flag AVFMT_NO_BYTE_SEEK.
  avformat: update AVInputFormat allowed flags
  avformat: don't unconditionally call ff_read_frame_flush() when trying to seek.
  truespeech: use sizeof() instead of hardcoded sizes
  truespeech: remove unneeded variable, 'consumed'
  truespeech: simplify truespeech_read_frame() by using get_bits()
  truespeech: decode directly to output buffer instead of a temp buffer
  truespeech: check to make sure channels == 1
  truespeech: check for large enough output buffer rather than truncating output
  truespeech: remove unneeded zero-size packet check.
  mlpdec: return meaningful error codes instead of -1
  mlpdec: remove unnecessary wrapper function
  mlpdec: only calculate output size once
  mlpdec: validate that the reported channel count matches the actual output channel count
  pcm: reduce pointer type casting
  ...

Conflicts:
	libavformat/avformat.h
	libavformat/id3v2.c
	libavformat/id3v2.h
	libavformat/utils.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-14 03:48:22 +02:00
doc Merge remote-tracking branch 'qatar/master' 2011-10-14 03:48:22 +02:00
ffpresets remove libx264 lossless presets 2011-09-26 22:04:23 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2011-10-14 03:48:22 +02:00
libavdevice Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
libavfilter vsrc_nullsrc: remove mathematical constants now redundant. 2011-10-13 18:08:51 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2011-10-14 03:48:22 +02:00
libavutil opt: handle AV_OPT_TYPE_CONST too 2011-10-14 02:18:55 +02:00
libpostproc postproc: fix compilation failure, now really 2011-09-24 01:51:35 +02:00
libswresample swresample: fix another broken indent chunk. 2011-10-10 15:55:28 +02:00
libswscale Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
mt-work Update todo 2011-06-12 18:01:29 +02:00
tests Merge remote-tracking branch 'qatar/master' 2011-10-14 03:48:22 +02:00
tools Merge remote-tracking branch 'hexene/stagefright' 2011-10-13 18:04:02 +02:00
.gitignore gitignore: add libswresample* 2011-09-19 17:39:38 +02:00
avconv.c Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
Changelog Merge remote-tracking branch 'qatar/master' 2011-10-11 03:42:43 +02:00
cmdutils_common_opts.h cmdutils: Fix loglevel for -debug 2011-10-14 02:18:55 +02:00
cmdutils.c cmdutils: Fix loglevel for -debug 2011-10-14 02:18:55 +02:00
cmdutils.h cmdutils.h: Project name cleanup 2011-10-14 02:18:55 +02:00
common.mak Add libswresample. 2011-09-19 07:04:17 +02:00
configure Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile doxygen: dont generate docs for avconv.c 2011-09-08 17:56:17 +02:00
ffmpeg.c Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
ffplay.c Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
ffprobe.c Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
INSTALL
LICENSE libaac+ support 2011-09-26 02:28:21 +02:00
MAINTAINERS Add libmodplug support. 2011-10-04 22:36:33 +02:00
Makefile Add libswresample. 2011-09-19 07:04:17 +02:00
README
RELEASE RELEASE: 0.8.5 has been released 2011-10-03 23:32:22 +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.