mirror of https://github.com/xenia-project/FFmpeg.git synced 2025-02-03 18:53:13 +00:00

Go to file

Michael Niedermayer 229a1e8694 Merge commit 'b2e059a1ffbdaaa985c6a7dcdd684fa034725238'

* commit 'b2e059a1ffbdaaa985c6a7dcdd684fa034725238':
  pixdesc: K&R formatting cosmetics

Conflicts:
	libavutil/pixdesc.c
	libavutil/pixdesc.h

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

2014-08-01 16:56:42 +02:00

compat

compat/w32pthreads: add return value to pthread_cond_init().

2014-05-26 11:33:42 +02:00

doc

Merge commit '52269f48e835a52023656f8330262ae70e6061c4'

2014-08-01 16:39:28 +02:00

libavcodec

Merge commit '92a36a6b3338df5f5cff573a486e182005367c24'

2014-08-01 16:48:09 +02:00

libavdevice

avdevice/oss_audio: Check SNDCTL_DSP_GETFMTS failure, print a warning but continue

2014-07-31 21:19:15 +02:00

libavfilter

Merge commit '52269f48e835a52023656f8330262ae70e6061c4'

2014-08-01 16:39:28 +02:00

libavformat

avformat/hlsenc: add some empty lines to make the code easier to read

2014-07-31 00:33:49 +02:00

libavresample

Merge commit 'b2d45654220503224aa94e78cdff19ec624e9342'

2014-05-29 01:23:22 +02:00

libavutil

Merge commit 'b2e059a1ffbdaaa985c6a7dcdd684fa034725238'

2014-08-01 16:56:42 +02:00

libpostproc

Fix libpostproc compilation with !HAVE_6REGS.

2014-04-24 17:50:02 +02:00

libswresample

fix spelling errors

2014-07-12 22:33:27 +02:00

libswscale

swscale/utils: fix rgb -> fullrange yuv

2014-07-19 23:24:26 +02:00

presets

presets: remove moldering iPod presets

2014-06-17 16:15:04 -08:00

tests

Merge commit '706208ef47bffd525c982975d2756f7b2b220b8d'

2014-08-01 15:03:22 +02:00

tools

tools/yuvcmp: add HAVE_UNISTD_H around #include <unistd.h>

2014-07-08 01:56:33 +02:00

.gitignore

Merge commit '706208ef47bffd525c982975d2756f7b2b220b8d'

2014-08-01 15:03:22 +02:00

arch.mak

Merge commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14'

2014-04-07 02:15:18 +02:00

Changelog

Changelog: add "version <next>:" so people dont add new things to the last release

2014-07-23 02:38:26 +02:00

cmdutils_common_opts.h

ffmpeg: add -devices param

2014-05-28 03:52:50 +02:00

cmdutils_opencl.c

cmdutils_opencl: Use av_malloc_array()

2014-07-01 03:49:36 +02:00

cmdutils.c

cmdutils: ignore sws_flags if swscale is not enabled

2014-06-29 17:27:23 +02:00

cmdutils.h

ffmpeg: add -devices param

2014-05-28 03:52:50 +02:00

common.mak

Merge commit 'afe176265480880e1f702c96a8ba434b0d88728b'

2014-05-20 03:33:30 +02:00

configure

Merge commit 'a0ce85ac7de098d3f9b53b51b77a09bad700a011'

2014-07-30 23:34:25 +02: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_dxva2.c

Merge commit 'a7c5fddac8137654cb503295c4dfb6492df43643'

2014-04-30 00:46:38 +02:00

ffmpeg_filter.c

ffmpeg_filter: refuse to configure input without a decoder.

2014-07-30 14:40:45 +02:00

ffmpeg_opt.c

Merge commit 'dc71f1958846bb1d96de43a4603983dc8450cfcc'

2014-07-29 00:06:32 +02:00

ffmpeg_vda.c

Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7'

2014-05-12 02:44:28 +02:00

ffmpeg_vdpau.c

Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'

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

ffmpeg.c

ffmpeg: Fix copying timebase to muxer context

2014-07-15 15:51:31 +02:00

ffmpeg.h

ffmpeg: support setting AVStream.discard

2014-06-07 21:26:22 +02:00

ffplay.c

ffplay: increase subtitle que size

2014-07-12 16:29:03 +02:00

ffprobe.c

ffprobe: print some basic information about avframe side data

2014-07-30 19:23:08 +02:00

ffserver.c

ffserver: use av_mallocz_array()

2014-07-17 18:00:25 +02:00

INSTALL.md

INSTALL: add markdown syntax

2014-05-28 22:38:38 +02:00

library.mak

Merge commit 'bb0babd7054bed7edfd9f4d6b20cdba864de1830'

2014-07-22 02:45:45 +02:00

LICENSE.md

LICENCE: add markdown syntax

2014-05-28 22:38:28 +02:00

MAINTAINERS

MAINTAINERS: update list of releases i maintain

2014-07-28 06:16:34 +02:00

Makefile

Merge commit 'd45ebd4876ab8fc07736a644de07e1b1d11a8e5d'

2014-07-22 03:06:43 +02:00

README.md

README: add markdown syntax

2014-05-28 22:38:11 +02:00

RELEASE

RELEASE: update, we are after 2.3 not 2.2

2014-07-28 03:11:04 +02:00

RELEASE_NOTES

RELEASE_NOTES: fix WebVTT decoder typo (-> encoder)

2014-07-25 13:22:00 +02:00

version.sh

version.sh: Print versions based on the last git tag for release branches

2014-07-28 15:44:59 +02:00

README.md

FFmpeg README

Documentation

Read the documentation in the doc/ directory in git.

You can also view it online at http://ffmpeg.org/documentation.html

Licensing

See the LICENSE file.

Build and Install

See the INSTALL file.

Languages

C 91.6%

Assembly 6.5%

Makefile 1.3%

C++ 0.2%

Objective-C 0.1%