FFmpeg git repo
Go to file
Michael Niedermayer 6716e6892b Merge remote-tracking branch 'qatar/master'
* qatar/master:
  FATE: Add ZeroCodec test
  oggparseogm: fix order of arguments of avpriv_set_pts_info().
  pngenc: better upper bound for encoded frame size.
  aiffdec: set block_duration to 1 for PCM codecs that are supported in AIFF-C
  aiffdec: factor out handling of integer PCM for AIFF-C and plain AIFF
  aiffdec: use av_get_audio_frame_duration() to set block_duration for AIFF-C
  aiffdec: do not set bit rate if block duration is unknown
  wmall: output packet only if we have decoded some samples

Conflicts:
	libavcodec/pngenc.c
	tests/fate/lossless-video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-22 20:59:58 +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-22 20:59:58 +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-22 20:59:58 +01:00
libavutil pixdesc: put components always in the same order. 2012-03-21 19:01:39 +01:00
libpostproc
libswresample
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-22 20:59:58 +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-22 00:40:11 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg.c Support dropping audio dts/pts via -async -1. 2012-03-22 20:36:16 +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.