FFmpeg

mirror of https://github.com/xenia-project/FFmpeg.git synced 2025-02-03 10:43:09 +00:00

Go to file

Michael Niedermayer 792845e436 Merge commit '3bc2e89c76e88ae6f1fd5287e0b11abcfc3c601c'

* commit '3bc2e89c76e88ae6f1fd5287e0b11abcfc3c601c':
  Bump libavutil major version to account for the LLS API/ABI changes.

Conflicts:
	libavutil/version.h

Bump done to stay compatible with libav, its not neccessary otherwise for ffmpeg
as we have the new ABI/API under LLS2 and the old (unused) under LLS

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

2013-12-16 21:52:51 +01:00

compat

Merge remote-tracking branch 'qatar/master'

2013-11-24 23:27:32 +01:00

doc

Merge commit '3bc2e89c76e88ae6f1fd5287e0b11abcfc3c601c'

2013-12-16 21:52:51 +01:00

libavcodec

avcodec/libx264: Set colorspace details correctly

2013-12-16 16:59:02 +01:00

libavdevice

Merge commit 'd64341e498fa46c6cf4c23d408177d7489559654'

2013-12-09 20:52:14 +01:00

libavfilter

lavfi/buffersrc: set min and max values for pix_fmt option

2013-12-16 18:08:17 +01:00

libavformat

avformat/psxstr: zero packet to prevent uninitialized data to leak through to the decoder

2013-12-16 04:32:50 +01:00

libavresample

avresample: Include libavutil/avutil.h in version.h

2013-12-06 22:13:20 +01:00

libavutil

Merge commit '3bc2e89c76e88ae6f1fd5287e0b11abcfc3c601c'

2013-12-16 21:52:51 +01:00

libpostproc

postproc: fix null pointer dereference with invalid option strings

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

libswresample

Add Windows resource file support for shared libraries

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

libswscale

swscale/x86/rgb2rgb_template: try to fix build failure with avx disabled

2013-12-16 03:38:13 +01:00

presets

presets: specify the codecs.

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

tests

fate: update after 5f6c21117f23a3c825777cdb0565a21c5a468d35

2013-12-15 12:22:07 +01:00

tools

tools/probetest: Check av_realloc() return code

2013-12-11 22:29:22 +01:00

.gitignore

Merge commit '3cd612d44789948f72b52944474e0870c5c60964'

2013-12-01 21:18:11 +01:00

arch.mak

Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'

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

Changelog

Changelog: correct typo

2013-12-14 21:47:17 +01:00

cmdutils_common_opts.h

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

2013-12-09 21:21:36 +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 & opencl: add -opencl_bench option to test and show available OpenCL devices

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

cmdutils.h

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

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

common.mak

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

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

configure

configure: (vp9) ensure bitstream compatibility

2013-12-16 03:17:39 +01:00

COPYING.GPLv2

Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1.

2009-06-05 09:51:31 +00:00

COPYING.GPLv3

Add configure option to upgrade (L)GPL to version 3.

2009-06-05 11:04:03 +00:00

COPYING.LGPLv2.1

cosmetics: Delete empty lines at end of file.

2012-02-09 12:26:45 +01:00

COPYING.LGPLv3

Add configure option to upgrade (L)GPL to version 3.

2009-06-05 11:04:03 +00:00

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

Merge remote-tracking branch 'qatar/master'

2013-12-04 04:30:46 +01:00

ffmpeg_vdpau.c

Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'

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

ffmpeg.c

Merge commit '674fa49110a661694188a958be13d529b7c8c5dd'

2013-12-11 23:36:10 +01:00

ffmpeg.h

Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'

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

ffplay.c

Merge commit '84f131921ffb43d8070d5680e91f6a24d66ccac4'

2013-12-11 23:49:44 +01:00

ffprobe.c

ffprobe: show best_effort_timestamp in the frame section

2013-12-15 10:46:46 +01:00

ffserver.c

ffserver: extend report_config_error() facilities, and use it for warnings

2013-12-16 19:19:04 +01:00

INSTALL

Merge remote branch 'qatar/master'

2011-04-08 02:50:13 +02:00

library.mak

Add Windows resource file support for shared libraries

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

LICENSE

libavfilter/vf_noise: relicense to LGPL

2013-10-27 20:29:07 +00:00

MAINTAINERS

MAINTAINERS: remove ffserver maintainership status notice

2013-12-13 09:42:15 +01:00

Makefile

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

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

README

README: be a tiny bit more verbose

2012-04-06 10:23:26 +02:00

RELEASE

RELEASE: update to 2.1.git

2013-11-29 16:41:42 +01: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 91.6%

Assembly 6.5%

Makefile 1.3%

C++ 0.2%

Objective-C 0.1%