ffmpeg

Go to file

Michael Niedermayer 3bc5aa65bb Merge commit '40c7613ecf2f3f7565309f9780183228605c3684' into release/2.2

* commit '40c7613ecf2f3f7565309f9780183228605c3684':
  doc: Fix syntax and logical errors in avconv stream combination example

Conflicts:
	doc/ffmpeg.texi

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

2014-09-20 14:48:28 +02:00

compat

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

2014-05-31 12:18:31 +02:00

doc

Merge commit '40c7613ecf2f3f7565309f9780183228605c3684' into release/2.2

2014-09-20 14:48:28 +02:00

libavcodec

mpegvideo: Use the current_picture pts

2014-08-26 06:33:07 +00:00

libavdevice

Merge commit '9fcc632249be3080836a3afce25b3092939743ac' into release/2.2

2014-09-20 14:40:54 +02:00

libavfilter

Merge commit '37e2d574ddcedc25e32bd963737b033354543789' into release/2.2

2014-08-23 03:15:51 +02:00

libavformat

mpegenc: limit the maximum muxrate

2014-08-27 06:30:52 +00:00

libavresample

Merge commit '9d02e38d3f03100784348ff75fd181d2aaad7e43' into release/2.2

2014-05-04 20:14:18 +02:00

libavutil

avutil/cpu: add aarch64 entries to 2nd table

2014-08-11 19:07:11 +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

x86/scale: fix xmm register count for hscale*_sse2

2014-07-15 02:14:55 +02:00

presets

presets: specify the codecs.

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

tests

Merge commit 'd396987c303bdc4eea7d1a1ff6776475d9bbd9ea' into release/2.2

2014-07-30 20:35:23 +02:00

tools

Merge commit 'a6a2d8eb8f125a2edb512a7a47df33dbd70d6b35' into release/2.2

2014-03-03 22:42:25 +01:00

.gitignore

gitignore: Add all examples below doc/examples

2014-03-02 11:42:37 -05:00

arch.mak

Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'

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

Changelog

Update Changelog for v10.4

2014-08-17 10:23:20 -04:00

cmdutils_common_opts.h

Allow hiding the banner.

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

cmdutils_opencl.c

cmdutils_opencl: Use av_malloc_array()

2014-07-14 23:04:44 +02: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

Improve the detection of architecture x86.

2014-05-31 12:14:48 +02:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

cosmetics: Delete empty lines at end of file.

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

COPYING.LGPLv3

…

CREDITS

CREDITS: redirect to Git log, remove current outdated content

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

ffmpeg_filter.c

ffmpeg_filter: refuse to configure input without a decoder.

2014-08-05 04:13:38 +02:00

ffmpeg_opt.c

ffmpeg_opt: reduce diff to libav in opt_target() by 16 lines

2014-09-20 14:29:47 +02:00

ffmpeg_vdpau.c

Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'

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

ffmpeg.c

ffmpeg: Use av_stream_get_parser() to avoid ABI issues

2014-07-14 23:26:06 +02: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 crash happening because of new streams occuring

2014-05-21 22:53:49 +02:00

ffserver.c

ffserver: initialize pbuffer in prepare_sdp_description()

2014-08-05 04:45:56 +02: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

Merge commit '1a7d1793d6d2de4201c2d9fc7056e7c9e202c5fe' into release/2.2

2014-09-20 14:46:53 +02: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

Prepare for 10.4 Release

2014-08-17 10:20:00 -04:00

version.sh

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

2014-08-05 22:18:00 +02: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%