Go to file
Michael Niedermayer 1232723741 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  aacenc: Fix issues with huge values of bit_rate.
  dv_tablegen: Drop unnecessary av_unused attribute from dv_vlc_map_tableinit().
  proresenc: multithreaded quantiser search
  riff: use bps instead of bits_per_coded_sample in the WAVEFORMATEXTENSIBLE header
  avconv: only set the "channels" option when it exists for the specified input format
  avplay: update get_buffer to be inline with avconv
  aacdec: More robust output configuration.
  faac: Fix multi-channel ordering
  faac: Add .channel_layouts
  rtmp: Support 'rtmp_playpath', an option which overrides the stream identifier
  rtmp: Support 'rtmp_app', an option which overrides the name of application
  avutil: add better documentation for AVSampleFormat

Conflicts:
	libavcodec/aac.h
	libavcodec/aacdec.c
	libavcodec/aacenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-18 00:28:06 +02:00
doc Merge remote-tracking branch 'qatar/master' 2012-04-17 12:13:22 +02:00
ffpresets
libavcodec Merge remote-tracking branch 'qatar/master' 2012-04-18 00:28:06 +02:00
libavdevice
libavfilter yadif: Improve pts calculation for is_second. 2012-04-17 19:41:16 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-04-18 00:28:06 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2012-04-18 00:28:06 +02:00
libpostproc
libswresample swr: add a swr_flags AVOption 2012-04-11 14:10:22 +02:00
libswscale sws: remove cliping in yuv2rgb code. 2012-04-15 23:38:42 +02:00
mt-work
presets
tests fate: libavutil tests do not require SAMPLES. 2012-04-17 12:01:31 +02:00
tools
.gitignore
arch.mak build: Consistently handle conditional compilation for all optimization OBJS. 2012-04-12 09:00:49 +02:00
Changelog lavfi: port 2xsai filter from libmpcodecs 2012-04-13 00:14:06 +02:00
cmdutils_common_opts.h
cmdutils.c avconv: get output pixel format from lavfi. 2012-04-15 20:22:36 +02:00
cmdutils.h Merge commit '3b266da3d35f3f7a61258b78384dfe920d875d29' 2012-04-17 04:03:50 +02:00
common.mak Merge remote-tracking branch 'qatar/master' 2012-04-13 00:39:19 +02:00
configure configure: add dependencies for colormatrix test. 2012-04-15 14:21:14 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg.c Merge remote-tracking branch 'qatar/master' 2012-04-18 00:28:06 +02:00
ffplay.c Merge remote-tracking branch 'qatar/master' 2012-04-18 00:28:06 +02:00
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS
Makefile Merge remote-tracking branch 'qatar/master' 2012-04-13 00:39:19 +02:00
README
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.