FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-14 00:58:38 +02:00

Go to file

Michael Niedermayer 2265212396 Merge commit 'e118bb1a33889d4df56f28975b4fd0793b4f5c32'

* commit 'e118bb1a33889d4df56f28975b4fd0793b4f5c32':
  mxf: Introduce ff_mxf_get_samples_per_frame

Conflicts:
	libavformat/mxf.c
	libavformat/mxf.h

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

2014-03-06 22:21:57 +01:00

compat

Correct the FSF address for two avisynth files to '51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA'

2014-03-06 20:44:33 +01:00

doc

Fix spelling errors in texi files: accomodate -> accommodate allows to -> allows one to choosen -> chosen compability -> compatibility explictly -> explicitly overriden -> overridden specifed -> specified Trasmission -> Transmission

2014-03-06 21:12:40 +01:00

libavcodec

Merge commit 'd48430c367947a64647c6959cf472f2c01778b17'

2014-03-06 22:04:51 +01:00

libavdevice

lavd/Makefile: Add fbdev_common.h to SKIPHEADERS

2014-03-06 15:42:15 +01:00

libavfilter

avfilter/vf_shuffleplanes: Fix flags / add AV_OPT_FLAG_FILTERING_PARAM

2014-03-06 16:58:24 +01:00

libavformat

Merge commit 'e118bb1a33889d4df56f28975b4fd0793b4f5c32'

2014-03-06 22:21:57 +01:00

libavresample

Merge remote-tracking branch 'qatar/master'

2014-02-22 21:12:02 +01:00

libavutil

Revert "lavu/buffer: add release function"

2014-03-06 03:23:40 +01:00

libpostproc

postproc: fix null pointer dereference with invalid option strings

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

libswresample

swr: check that the context for swr_convert() has been initialized

2014-02-24 08:23:42 +01:00

libswscale

libswscale: bayer to rgb24 & yv12 colorspace converters

2014-02-23 02:38:22 +01:00

presets

presets: specify the codecs.

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

tests

Merge commit 'e1f2987b10112489f6da5501d4c8735a798c9e3f'

2014-03-06 13:09:06 +01:00

tools

Merge commit 'ea7f79f93796d68559a495be824b6bbd94dfe5f6'

2014-03-01 14:44:58 +01:00

.gitignore

Merge commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a'

2014-02-25 20:26:00 +01:00

arch.mak

Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'

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

Changelog

Merge commit '599b81ca9a8e04a27ddad94af462171d16063167'

2014-03-06 13:07:20 +01: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

Allow hiding the banner.

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

cmdutils.h

Allow hiding the banner.

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

common.mak

Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90'

2014-02-17 02:22:01 +01:00

configure

Merge commit 'd48430c367947a64647c6959cf472f2c01778b17'

2014-03-06 22:04:51 +01:00

COPYING.GPLv2

…

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

ffmpeg_opt: get_preset_file_2(): fix avio_open2() return code check

2014-02-25 00:05:37 +01:00

ffmpeg_vdpau.c

Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'

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

ffmpeg.c

ffmpeg: dont try to run the subtitle encoder on non subtitle streams

2014-03-03 21:06:24 +01:00

ffmpeg.h

Merge commit '67f2a688143b644f99360565a9f36c61a5f052e9'

2014-02-24 21:08:19 +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: merge RTSP's teardown & pause routines

2014-02-14 14:31:42 -03:00

INSTALL

Merge remote branch 'qatar/master'

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

library.mak

Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90'

2014-02-17 02:22:01 +01:00

LICENSE

Add libx265 encoder

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

MAINTAINERS

update for 2.2

2014-03-01 03:34:59 +01:00

Makefile

tools: add uncoded_frame test program.

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

README

README: be a tiny bit more verbose

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

RELEASE

RELEASE: update for 2.2

2014-03-01 17:09:12 +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 90.3%

Assembly 7.8%

Makefile 1.3%

C++ 0.2%

Objective-C 0.1%

Other 0.1%