1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Go to file
Michael Niedermayer 6ec26157b9 Merge commit '2957d29f0531ccd8a6f4378293424dfd92db3044'
* commit '2957d29f0531ccd8a6f4378293424dfd92db3044':
  alpha: hpeldsp: Move half-pel assembly from dsputil to hpeldsp

Conflicts:
	libavcodec/alpha/dsputil_alpha.c
	libavcodec/alpha/hpeldsp_alpha.c
	libavcodec/alpha/hpeldsp_alpha.h
	libavcodec/alpha/hpeldsp_alpha_asm.S
	libavcodec/hpeldsp.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-20 15:24:25 +02:00
compat
doc doc/general: animated GIF are now compressed. 2013-04-19 23:59:21 +02:00
libavcodec Merge commit '2957d29f0531ccd8a6f4378293424dfd92db3044' 2013-04-20 15:24:25 +02:00
libavdevice
libavfilter lavc: add AV_CODEC_PROP_TEXT_SUB. 2013-04-19 13:15:54 +02:00
libavformat lavf/gif: add final_delay option. 2013-04-20 00:11:04 +02:00
libavresample
libavutil lavu: add av_clipd_c 2013-04-18 14:38:21 +00:00
libpostproc
libswresample swr/rematrix: use av_calloc() 2013-04-15 20:31:06 +02:00
libswscale Fix libswscale compilation with --disable-optimizations on x86-32. 2013-04-18 12:47:16 +02:00
presets
tests lavc/gif: add flag to enable transparency detection between frames. 2013-04-19 23:59:21 +02:00
tools
.gitignore
arch.mak
Changelog Changelog: notify GIF improvements. 2013-04-19 23:59:22 +02:00
cmdutils_common_opts.h
cmdutils.c cmdutils: make the "-help filter=" output less confusing 2013-04-18 13:03:00 +02:00
cmdutils.h
common.mak
configure Merge commit '28bc406c84b04a5f1458b90ff52ddbec73e46202' 2013-04-20 13:21:18 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c ffmpeg: make -aspect work with -vcodec copy. 2013-04-18 22:59:54 +02:00
ffmpeg.c ffmpeg: make -aspect work with -vcodec copy. 2013-04-18 22:59:54 +02:00
ffmpeg.h
ffplay.c ffplay: use format title metadata to set window caption. 2013-04-17 11:08:49 +02:00
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS
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.