1
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-09-28 07:53:47 +02:00
Go to file
Michael Niedermayer 8bf95e8bd5 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  avc: Add a function for converting mp4 style extradata to annex b
  pthread: free progress if buffer allocation failed.
  lavc/avconv: support changing frame sizes in codecs with frame mt.
  libavformat: Document who sets the AVStream.id field
  utvideo: mark output picture as keyframe.
  sunrast: Add support for negative linesize.
  vp8: fix update_lf_deltas in libavcodec/vp8.c
  ralf: read Huffman code lengths without GetBitContext

Conflicts:
	ffmpeg.c
	libavcodec/sunrastenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-25 01:56:53 +01:00
doc doc/examples/decoding_encoding: make the buffer bigger. 2012-03-22 05:25:26 +01:00
ffpresets
libavcodec Merge remote-tracking branch 'qatar/master' 2012-03-25 01:56:53 +01:00
libavdevice x11grab: fix compilation 2012-03-18 01:12:03 +01:00
libavfilter bbox: remove superfluous initializations 2012-03-22 13:40:37 +01:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-03-25 01:56:53 +01:00
libavutil pixdesc: put components always in the same order. 2012-03-21 19:01:39 +01:00
libpostproc
libswresample swr: fix compilation failure with old versions of gcc. 2012-03-25 00:35:10 +01:00
libswscale swscale: Merge a hunk from qatar that seems to have been forgotten or lost. 2012-03-21 15:30:52 +01:00
mt-work
presets
tests Merge remote-tracking branch 'qatar/master' 2012-03-24 10:59:43 +01:00
tools
.gitignore
Changelog lavfi: add tile video filter. 2012-03-21 15:52:45 +01:00
cmdutils_common_opts.h
cmdutils.c Merge remote-tracking branch 'qatar/master' 2012-03-18 23:39:42 +01:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2012-03-18 23:39:42 +01:00
common.mak
configure Merge remote-tracking branch 'qatar/master' 2012-03-23 21:20:06 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg.c Merge remote-tracking branch 'qatar/master' 2012-03-25 01:56:53 +01:00
ffplay.c ffplay: use frame count based queueing for audio queue 2012-03-19 22:54:40 +01:00
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS ZeroCodec Decoder 2012-03-19 00:19:13 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-03-21 01:33:53 +01:00
README
RELEASE
version.sh

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.