FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00

Go to file

Michael Niedermayer e03c1af55e Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vp9: add a new segmentation sample.

Conflicts:
	tests/fate/vpx.mak
	tests/ref/fate/vp9-segmentation-aq-akiyo
	tests/ref/fate/vp9-segmentation-sf-akiyo

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

2014-02-13 00:41:40 +01:00

compat

compat: provide va_copy for old gcc versions.

2013-12-30 12:38:03 +01:00

doc

Add libx265 encoder

2014-02-12 13:13:17 +00:00

libavcodec

Merge commit '50ea93158d4c480f64069e8bd1da388486dcf4ba'

2014-02-13 00:15:28 +01:00

libavdevice

lavf/lavd: version bump and APIchanges for uncoded frames.

2014-02-11 10:34:32 +01:00

libavfilter

Merge commit '4a7d3837b4dd17fff270b55166597c093204e542'

2014-02-12 14:49:29 +01:00

libavformat

avformat/asfdec: pass on error code from avio_seek()

2014-02-12 17:10:26 +01:00

libavresample

Merge commit '76a75c523cd3c63560185394a0a5cd7249db962a'

2014-02-08 18:38:17 +01:00

libavutil

Merge commit '25a1ba814ad80056247fd357ec4c6911324a3f66'

2014-02-12 14:41:24 +01:00

libpostproc

postproc: fix null pointer dereference with invalid option strings

2013-12-11 22:28:42 +01:00

libswresample

swresample: Add arm&x86 clobber tests

2014-01-18 18:38:57 +01:00

libswscale

Merge remote-tracking branch 'qatar/master'

2014-01-21 22:20:26 +01:00

presets

presets: specify the codecs.

2012-05-04 18:40:36 +02:00

tests

Merge remote-tracking branch 'qatar/master'

2014-02-13 00:41:40 +01:00

tools

tools: add uncoded_frame test program.

2014-02-11 10:31:29 +01:00

.gitignore

examples: add avio_reading.c example

2014-02-02 11:58:23 +01:00

arch.mak

Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'

2012-12-08 14:24:16 +01:00

Changelog

Add libx265 encoder

2014-02-12 13:13:17 +00:00

cmdutils_common_opts.h

Allow hiding the banner.

2013-12-29 22:57:20 +01:00

cmdutils_opencl.c

cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices

2013-12-09 21:21:36 +01:00

cmdutils.c

cmdutils: update copyright year to 2014.

2014-01-05 22:39:35 +02:00

cmdutils.h

Allow hiding the banner.

2013-12-29 22:57:20 +01:00

common.mak

common.mak: Less ugly version of the previous windres fix

2013-12-09 02:47:55 +01:00

configure

Add libx265 encoder

2014-02-12 13:13:17 +00:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

COPYING.LGPLv3

…

CREDITS

CREDITS: redirect to Git log, remove current outdated content

2013-01-31 18:02:52 +01:00

ffmpeg_filter.c

Merge remote-tracking branch 'qatar/master'

2013-11-24 05:21:19 +01:00

ffmpeg_opt.c

ffmpeg: do not fail when options are routed to libavformat and libavcodec and only one can be used

2014-01-03 02:24:27 +01:00

ffmpeg_vdpau.c

Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'

2013-11-23 14:46:48 +01:00

ffmpeg.c

ffmpeg: fix vstats

2014-02-10 20:31:06 +01:00

ffmpeg.h

ffmpeg: change ost->finished to an enum

2014-01-17 23:57:02 +01:00

ffplay.c

Merge commit 'b36bc81ccaa2fc85dc4bae7dc546c71e8833573d'

2014-02-10 13:26:31 +01:00

ffprobe.c

ffprobe: check av_frame_alloc() failure.

2013-12-30 10:58:01 +01:00

ffserver.c

ffserver: drop unneeded delay1 var

2014-02-08 00:30:29 -03:00

INSTALL

…

library.mak

Add Windows resource file support for shared libraries

2013-12-05 23:42:07 +01:00

LICENSE

Add libx265 encoder

2014-02-12 13:13:17 +00:00

MAINTAINERS

MAINTAINERS: add myself as opengl_enc.c maintainer

2014-01-28 15:30:49 +01:00

Makefile

tools: add uncoded_frame test program.

2014-02-11 10:31:29 +01:00

README

…

RELEASE

Prepare for 10_alpha2 Release

2014-01-18 10:27:27 -05:00

version.sh

version.sh: add preprocessing guards

2013-11-30 21:42:03 +01:00

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.1%

Assembly 7.9%

Makefile 1.3%

C++ 0.2%

Objective-C 0.2%

Other 0.1%