FFmpeg git repo
Go to file
Michael Niedermayer 3630a07513 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  libmp3lame: add missing layout terminator
  avconv: multithreaded demuxing.
  Bump lavu minor and add an APIChanges entry for audioconvert functions.
  audioconvert: add a function for extracting the channel with the given index
  audioconvert: add a function for getting the name of a single channel.
  audioconvert: add a function for getting channel's index in layout
  audioconvert: use av_popcount64 in av_get_channel_layout_nb_channels
  vf_libopencv: add missing headers.
  iac: add missing dependency

Conflicts:
	configure
	doc/APIchanges
	ffmpeg.c
	libavcodec/libmp3lame.c
	libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-10 21:34:15 +02:00
doc Merge remote-tracking branch 'qatar/master' 2012-06-10 21:34:15 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2012-06-10 21:34:15 +02:00
libavdevice sdl: fix aspect ratio computations. 2012-06-10 09:57:50 +02:00
libavfilter lavfi: fix signature for default_filter_name() 2012-06-10 17:23:58 +02:00
libavformat mpegtsenc: prevent pcr_packet_period==0 2012-06-10 16:50:06 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2012-05-30 19:32:06 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2012-06-10 21:34:15 +02:00
libpostproc postprocess: fix another void returning void function. 2012-06-10 18:26:16 +02:00
libswresample swr: skip memset(0) in rematrix when the array is known to be already 0 2012-06-09 02:43:10 +02:00
libswscale colorspace-test: add few more tests 2012-06-09 14:38:51 +00:00
mt-work
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests fate-acodec-dca2: add bitexact flag 2012-06-10 02:57:45 +02:00
tools tools/graph2dot: factorize code printing non-media specific link information 2012-06-06 23:20:02 +02:00
.gitignore doc/examples: add programs to .gitignore. 2012-05-12 19:58:33 +02:00
arch.mak build: Consistently handle conditional compilation for all optimization OBJS. 2012-04-12 09:00:49 +02:00
Changelog Merge remote-tracking branch 'qatar/master' 2012-06-06 01:08:33 +02:00
cmdutils_common_opts.h cmdutils: fix -fdebug without -v xy 2012-04-05 21:50:50 +02:00
cmdutils.c cmdutils: dont return void from a void function 2012-06-10 02:38:01 +02:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2012-06-06 01:08:33 +02:00
common.mak Merge remote-tracking branch 'qatar/master' 2012-05-05 20:22:09 +02:00
configure Merge remote-tracking branch 'qatar/master' 2012-06-10 21:34:15 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg.c Merge remote-tracking branch 'qatar/master' 2012-06-10 21:34:15 +02:00
ffplay.c ffplay: fix return value of get_video_frame if avcodec_decode_video fails 2012-06-09 19:45:10 +02:00
ffprobe.c ffprobe: show packet duration in frame 2012-06-06 23:26:04 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2012-05-06 21:53:19 +02:00
INSTALL
library.mak Merge remote-tracking branch 'qatar/master' 2012-03-26 20:52:52 +02:00
LICENSE
MAINTAINERS MAINTAINERS: update versions 2012-05-24 21:15:01 +02:00
Makefile doc/examples: install them with the shared data. 2012-05-19 12:28:59 +02:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE RELEASE: bump to current version (0.10.2). 2012-03-26 22:47:28 +02:00
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.