ffmpeg

Go to file

Michael Niedermayer 742f9aa879 Merge commit '0f6e309b97e3da83a0fa75fbf1c4b50cd72047eb' into release/2.2

* commit '0f6e309b97e3da83a0fa75fbf1c4b50cd72047eb':
  mp3enc: Properly write bitrate value in XING header

Conflicts:
	libavformat/mp3enc.c

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

2014-05-04 20:13:41 +02:00

compat

compat: provide va_copy for old gcc versions.

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

doc

update for 2.2.1

2014-04-10 05:09:51 +02:00

libavcodec

avcodec/vorbisdec: try to workaround libvorbisenc bug

2014-05-01 18:22:19 +02:00

libavdevice

Fix pthread-related compile errors in iec61883.c

2014-03-23 21:01:50 +01:00

libavfilter

avfilter/vf_pullup: fix gray8

2014-04-10 04:53:00 +02:00

libavformat

Merge commit '0f6e309b97e3da83a0fa75fbf1c4b50cd72047eb' into release/2.2

2014-05-04 20:13:41 +02:00

libavresample

Merge remote-tracking branch 'qatar/master'

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

libavutil

avutil/avstring: do not lose ascii characters when decoding non utf-8 with av_utf8_decode()

2014-04-16 19:20:20 +02:00

libpostproc

postproc: fix null pointer dereference with invalid option strings

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

libswresample

swresample: fix AV_CH_LAYOUT_STEREO_DOWNMIX input

2014-04-24 08:59:56 +02:00

libswscale

sws: dont use the optimized 410->420 unscaled conversion when height%4

2014-05-01 18:23:30 +02:00

presets

presets: specify the codecs.

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

tests

swscale/utils: Fix color range of gray16

2014-03-19 03:14:39 +01:00

tools

Merge commit 'a6a2d8eb8f125a2edb512a7a47df33dbd70d6b35' into release/2.2

2014-03-03 22:42:25 +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

Autodetect VDA like all other hardware acccelerations.

2014-03-23 19:05:59 +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

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

Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90'

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

configure

Always pass the configure option sysroot to --sysroot and -isysroot.

2014-03-23 20:12:54 +01: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_opt: check that a subtitle encoder is available before auto mapping streams

2014-03-17 15:45:49 +01:00

ffmpeg_vdpau.c

Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'

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

ffmpeg.c

ffmpeg: dont call exit_program() from a signal hander

2014-03-23 20:31:05 +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: fix scaling of vali in value_string() in case -prefix is selected

2014-04-23 17:11:16 +02:00

ffserver.c

ffserver: merge RTSP's teardown & pause routines

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

INSTALL

…

library.mak

Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90'

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

LICENSE

Add libx265 encoder

2014-02-12 13:12:22 +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

update for 2.2.1

2014-04-10 05:09:51 +02:00

VERSION

update for 2.2.1

2014-04-10 05:09:51 +02: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 92.1%

Assembly 6%

Makefile 1.2%

C++ 0.3%

Objective-C 0.2%

Other 0.1%