FFmpeg git repo
Go to file
Michael Niedermayer 15fe694e5c Merge commit 'b4679ecdbd80ae050094733f137ccd7ebf1316ab'
* commit 'b4679ecdbd80ae050094733f137ccd7ebf1316ab':
  {v,a}f_showinfo: print frame side data

Conflicts:
	libavfilter/af_ashowinfo.c
	libavfilter/vf_showinfo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-24 15:32:48 +01:00
compat
doc Merge commit '06c3cd3c0186803619bc6aad2d8f06c3e9015d15' 2014-03-24 15:04:47 +01:00
libavcodec Merge commit '4a0f6651434c6f213d830140f575b4ec7858519f' 2014-03-24 14:26:17 +01:00
libavdevice
libavfilter Merge commit 'b4679ecdbd80ae050094733f137ccd7ebf1316ab' 2014-03-24 15:32:48 +01:00
libavformat Merge commit '15c5a8d22d12d29a364ca2ab6438f1dee2fa08c7' 2014-03-24 15:11:08 +01:00
libavresample
libavutil Merge commit 'd161ae0a37900cbd36c1390ca32a56b892c02ab5' 2014-03-24 14:51:44 +01:00
libpostproc
libswresample swresample/resample: sse float linear interpolation 2014-03-24 02:34:02 +01:00
libswscale swscale/swscale: fix integer overflow 2014-03-24 05:01:32 +01:00
presets
tests fate: add tests for linearly interpolated resampling 2014-03-24 04:25:44 +01:00
tools tools: add dvd2concat. 2014-03-23 19:15:07 +01:00
.gitignore
arch.mak
Changelog Merge commit '15c5a8d22d12d29a364ca2ab6438f1dee2fa08c7' 2014-03-24 15:11:08 +01:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c
cmdutils.h
common.mak
configure Merge remote-tracking branch 'qatar/master' 2014-03-24 06:09:31 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg_vdpau.c
ffmpeg.c Merge commit '59444c76e6d43529a12dbd80b6dd29c6ba4079a9' 2014-03-24 14:44:22 +01:00
ffmpeg.h Merge commit '59444c76e6d43529a12dbd80b6dd29c6ba4079a9' 2014-03-24 14:44:22 +01:00
ffplay.c
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS lavu: add myself as dynarray.h maintainer. 2014-03-23 19:17:20 +01:00
Makefile
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.