FFmpeg git repo
Go to file
Michael Niedermayer 6bfb3042b3 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  avconv: use default alignment for audio buffer
  avcodec: use align == 0 for default alignment in avcodec_fill_audio_frame()
  avutil: use align == 0 for default alignment in audio sample buffer functions
  avutil: allow NULL linesize in av_samples_fill_arrays() and av_samples_alloc()
  avconv: remove OutputStream.picref.
  avconv: only set SAR once on the decoded frame.
  avcodec: validate the channel layout vs. channel count for decoders
  audioconvert: make av_get_channel_layout accept composite names.
  avutil: add av_get_packed_sample_fmt() and av_get_planar_sample_fmt()

Conflicts:
	doc/APIchanges
	ffmpeg.c
	libavcodec/utils.c
	libavcodec/version.h
	libavutil/audioconvert.c
	libavutil/audioconvert.h
	libavutil/avutil.h
	libavutil/samplefmt.c
	libavutil/samplefmt.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-09 23:02:33 +02:00
doc Merge remote-tracking branch 'qatar/master' 2012-04-09 23:02:33 +02:00
ffpresets
libavcodec Merge remote-tracking branch 'qatar/master' 2012-04-09 23:02:33 +02:00
libavdevice Merge remote-tracking branch 'qatar/master' 2012-04-04 21:17:52 +02:00
libavfilter vf_scale: ensure the palette is set for output. 2012-04-09 17:21:35 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-04-08 20:55:11 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2012-04-09 23:02:33 +02:00
libpostproc
libswresample swr-test: remove unused variable 2012-04-01 22:24:06 +02:00
libswscale Merge remote-tracking branch 'qatar/master' 2012-04-05 22:26:50 +02:00
mt-work
presets
tests Fix gif regression test on big-endian. 2012-04-09 21:55:52 +02:00
tools
.gitignore
Changelog Merge remote-tracking branch 'qatar/master' 2012-04-07 22:41:37 +02:00
cmdutils_common_opts.h cmdutils: fix -fdebug without -v xy 2012-04-05 21:50:50 +02:00
cmdutils.c
cmdutils.h
common.mak
configure configure: fix - vs _ error 2012-04-08 09:43:38 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg.c Merge remote-tracking branch 'qatar/master' 2012-04-09 23:02:33 +02:00
ffplay.c Merge remote-tracking branch 'qatar/master' 2012-04-07 22:41:37 +02:00
ffprobe.c ffprobe: use avbprint API 2012-04-08 00:02:21 +02:00
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS
Makefile
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE
version.sh

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

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

* Read the documentation in the doc/ directory in git.
  You can also view it online at http://ffmpeg.org/documentation.html

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

* See the LICENSE file.

3) Build and Install
--------------------

* See the INSTALL file.