FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-14 22:22:59 +02:00

Go to file

Michael Niedermayer f4b05cd841 Merge commit '5e83d9aced2fc2b2e1360452794c58aba55d497c'

* commit '5e83d9aced2fc2b2e1360452794c58aba55d497c':
  h264: fully support cropping.

Conflicts:
	doc/APIchanges
	libavcodec/h264.c
	libavcodec/h264_ps.c
	libavcodec/options_table.h
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2013-04-19 22:46:51 +02:00

compat

…

doc

Merge commit '5e83d9aced2fc2b2e1360452794c58aba55d497c'

2013-04-19 22:46:51 +02:00

libavcodec

Merge commit '5e83d9aced2fc2b2e1360452794c58aba55d497c'

2013-04-19 22:46:51 +02:00

libavdevice

…

libavfilter

lavc: add AV_CODEC_PROP_TEXT_SUB.

2013-04-19 13:15:54 +02:00

libavformat

Merge commit '505642f18276aed03278ac91b1f334ea888eac6a'

2013-04-19 21:36:23 +02:00

libavresample

…

libavutil

lavu: add av_clipd_c

2013-04-18 14:38:21 +00:00

libpostproc

…

libswresample

…

libswscale

Fix libswscale compilation with --disable-optimizations on x86-32.

2013-04-18 12:47:16 +02:00

presets

…

tests

lavf/gif: correct the delay after the first frame.

2013-04-19 12:02:19 +02:00

tools

…

.gitignore

…

arch.mak

…

Changelog

subtitles: introduce ASS codec id and use it.

2013-04-18 23:23:59 +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

Fix pgc compilation with --disable-optimizations.

2013-04-18 02:20:04 +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

…

ffprobe.c

…

ffserver.c

…

INSTALL

…

library.mak

…

LICENSE

…

MAINTAINERS

…

Makefile

…

README

…

RELEASE

…

version.sh

…

README

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.

Languages

C 90.3%

Assembly 7.8%

Makefile 1.3%

C++ 0.2%

Objective-C 0.2%

Other 0.1%