1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-12 19:18:44 +02:00
Go to file
Michael Niedermayer 4210cbf193 Merge commit 'f66d0c57b13c1b7102e1e353237af178960dd3c5'
* commit 'f66d0c57b13c1b7102e1e353237af178960dd3c5':
  latm: Add a probe function

Conflicts:
	libavformat/rawdec.c

See: 47818b2a67
See: 097f668047
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-04 00:19:35 +02:00
compat
doc avfilter/edgedetect: add a colormix mode. 2014-05-03 19:07:14 +02:00
libavcodec Merge commit 'a90d92ce2aeea8eaae5c616958d20e000e20b964' 2014-05-03 23:21:26 +02:00
libavdevice lavd/xv: reident after previous commits 2014-05-02 18:04:05 +02:00
libavfilter avfilter/vf_deshake: dont pass the wrong context into the SAD functions 2014-05-03 22:52:17 +02:00
libavformat Merge commit 'f66d0c57b13c1b7102e1e353237af178960dd3c5' 2014-05-04 00:19:35 +02:00
libavresample Merge commit 'a24a252709dd38f12aa4929ce4981f87091a5113' 2014-04-25 01:19:27 +02:00
libavutil Merge commit 'de69aedf9935631b7f78e8b8da6e460422a9bc5f' 2014-05-03 23:46:36 +02:00
libpostproc
libswresample Fix convertion typos 2014-04-29 00:09:08 +02:00
libswscale Merge commit '3a177a9cca924e097265b32f9282814f6b653e08' 2014-05-03 23:36:54 +02:00
presets
tests avfilter/edgedetect: add a colormix mode. 2014-05-03 19:07:14 +02:00
tools lavc: add codec descriptors for TTF and OTF. 2014-04-29 13:24:18 +02:00
.gitignore
arch.mak
Changelog Merge commit '1c0210c7981b6a61043d9171f506b435ff5a1f5e' 2014-05-01 14:14:10 +02:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c cmdutils: omit deprecated codec ids in help output 2014-04-29 22:13:35 +02:00
cmdutils.h
common.mak
configure Enable opencl wihtout pthreads. 2014-05-02 05:37:07 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_dxva2.c Merge commit 'a7c5fddac8137654cb503295c4dfb6492df43643' 2014-04-30 00:46:38 +02:00
ffmpeg_filter.c ffmpeg_filter: make *jpeg_formats static const 2014-04-28 00:22:38 +02:00
ffmpeg_opt.c Merge commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a' 2014-04-29 01:47:53 +02:00
ffmpeg_vdpau.c
ffmpeg.c ffmpeg: put the sizeof() second in av_malloc_array() 2014-05-01 22:01:38 +02:00
ffmpeg.h Merge commit '35177ba77ff60a8b8839783f57e44bcc4214507a' 2014-04-29 01:22:22 +02:00
ffplay.c
ffprobe.c ffprobe: use the codec descriptor if no decoder was found. 2014-04-29 13:25:59 +02:00
ffserver.c ffserver: do not ignore lseek() return 2014-04-29 01:08:06 -04:00
INSTALL
library.mak
LICENSE
MAINTAINERS
Makefile Merge commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a' 2014-04-29 01:47:53 +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.