No description
Find a file
Michael Niedermayer a75bf4e5c1 Merge commit '34a0ac41a8'
* commit '34a0ac41a8':
  vf_aspect: support variables in evaluating the aspect ratios

Conflicts:
	Changelog
	doc/filters.texi
	libavfilter/vf_aspect.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-03 11:54:19 +01:00
compat
doc Merge commit '34a0ac41a8' 2013-11-03 11:54:19 +01:00
libavcodec avcodec/hevc_sei: Fix null dereference in decode_pic_timing() 2013-11-03 02:19:28 +01:00
libavdevice lavd/xv: free graphics context 2013-11-01 16:20:50 +01:00
libavfilter Merge commit '34a0ac41a8' 2013-11-03 11:54:19 +01:00
libavformat Merge remote-tracking branch 'qatar/master' 2013-11-02 18:37:21 +01:00
libavresample Merge commit '211ca69b13' 2013-10-28 09:59:53 +01:00
libavutil avutil/xtea: add Doxy @file and group 2013-11-03 00:59:38 +01:00
libpostproc
libswresample lswr/swresample: convert ocl and icl options to AV_OPT_TYPE_CHANNEL_LAYOUT 2013-10-17 18:09:54 +02:00
libswscale Optimize pure C unscaled yuv2rgb. 2013-10-30 20:52:24 +01:00
presets
tests FATE: Add HEVC tests 2013-10-31 20:20:16 +01:00
tools Merge remote-tracking branch 'qatar/master' 2013-10-05 11:35:39 +02:00
.gitignore
arch.mak
Changelog Merge commit '34a0ac41a8' 2013-11-03 11:54:19 +01:00
cmdutils.c cmdutils: fix expected signature for show_colors() function 2013-10-28 09:41:25 +01:00
cmdutils.h cmdutils: fix expected signature for show_colors() function 2013-10-28 09:41:25 +01:00
cmdutils_common_opts.h cmdutils: add -colors option 2013-10-27 09:18:45 +01:00
common.mak
configure Merge remote-tracking branch 'qatar/master' 2013-11-02 10:38:03 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg.c Merge commit 'ccc7129845' 2013-11-01 18:22:42 +01:00
ffmpeg.h Merge commit 'c872d310cd' 2013-10-29 21:38:53 +01:00
ffmpeg_filter.c ffmpeg_filter: Fix non jpeg yuv in jpeg support 2013-10-27 17:41:06 +01:00
ffmpeg_opt.c make it possible to compile ffmpeg without swscale 2013-10-21 13:57:00 +00:00
ffplay.c ffplay: add support for libswresample options 2013-10-26 12:23:54 +02:00
ffprobe.c ffprobe: fix consistency checks in parse_read_intervals() 2013-10-21 13:33:06 +02:00
ffserver.c ffserver: strip odd chars from html error messages before sending them back 2013-10-09 00:30:46 +02:00
INSTALL
library.mak build: remove pointless condition 2013-10-29 14:00:29 +00:00
LICENSE libavfilter/vf_noise: relicense to LGPL 2013-10-27 20:29:07 +00:00
MAINTAINERS MAINTAINERS: add myself for libvpx* 2013-11-03 00:34:04 +01:00
Makefile build: Ensure that strip commands are run silently 2013-10-31 11:48:59 +01: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.