FFmpeg git repo
Go to file
Michael Niedermayer 4ca6a151e0 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  avconv: print the codecs names in the stream mapping.
  avconv: move the avcodec_find_decoder() call to add_input_streams().
  Windows Media Image decoder (WMVP/WVP2)
  ac3enc: remove outdated TODO comment for apply_channel_coupling()

Conflicts:
	Changelog
	libavcodec/avcodec.h
	libavcodec/vc1dec.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-23 18:26:37 +02:00
doc Merge remote-tracking branch 'qatar/master' 2011-08-23 18:26:37 +02:00
ffpresets Remove libx264 baseline ffpreset 2011-07-28 01:44:57 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2011-08-23 18:26:37 +02:00
libavdevice lavdev/lavfi: set sample aspect ratio in the output stream/codec context 2011-08-21 15:27:09 +02:00
libavfilter lavfi: rename vsrc_movie.c to src_movie.c 2011-08-23 15:45:53 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2011-08-23 18:26:37 +02:00
libavutil lavu: add av_get_media_type_string() convenience function 2011-08-20 14:20:25 +02:00
libpostproc
libswscale Merge remote-tracking branch 'qatar/master' 2011-08-18 10:56:08 +02:00
mt-work
tests fate: add h264 intra 4:2:2 tests 2011-08-23 14:29:36 +02:00
tools lavfi-showfiltfmts: extend output format for specifying audio data 2011-07-28 10:04:09 +02:00
.gitignore lavc: add a table of all codecs names. 2011-08-22 10:54:44 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Changelog Merge remote-tracking branch 'qatar/master' 2011-08-23 18:26:37 +02:00
Doxyfile
INSTALL
LICENSE
MAINTAINERS
Makefile Fix NASM include directive 2011-08-15 11:24:35 -07:00
README
RELEASE set Release to 0.8.2.git. We are at 0.8.2 and a bit further. 2011-08-13 03:39:58 +02:00
avconv.c Merge remote-tracking branch 'qatar/master' 2011-08-23 18:26:37 +02:00
cmdutils.c Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925' 2011-08-13 02:56:08 +02:00
cmdutils.h Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925' 2011-08-13 02:56:08 +02:00
cmdutils_common_opts.h
common.mak Merge remote-tracking branch 'qatar/master' 2011-08-15 23:35:53 +02:00
configure Merge remote-tracking branch 'qatar/master' 2011-08-23 18:26:37 +02:00
ffmpeg.c ffmpeg: use avcodec_get_name to report missing en/decoders. 2011-08-22 12:13:27 +02:00
ffplay.c ffplay: remove unnecessary if (cur_stream) checks 2011-08-21 20:33:02 +02:00
ffprobe.c ffprobe: use av_get_media_type_string() in media_type_string(), simplify 2011-08-20 14:20:25 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2011-07-15 17:51:09 +02:00
subdir.mak Merge remote-tracking branch 'qatar/master' 2011-07-31 00:34:47 +02:00
version.sh version.sh: handle shallow clones and snapshots. 2011-07-22 10:43:59 +02:00

README

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.