FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-02-04 14:30:55 +08:00

Go to file

Michael Niedermayer b71e4d8717 Merge commit '8941971a8f2e24b9a84fe29f128d13ceb89c0a65'

* commit '8941971a8f2e24b9a84fe29f128d13ceb89c0a65':
  lavc: make error_rate a private option of mpegvideo encoders

Conflicts:
	libavcodec/options_table.h
	libavcodec/version.h

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

2013-11-14 13:14:41 +01:00

compat

Merge remote-tracking branch 'qatar/master'

2013-11-07 23:39:31 +01:00

doc

Merge commit '8941971a8f2e24b9a84fe29f128d13ceb89c0a65'

2013-11-14 13:14:41 +01:00

libavcodec

Merge commit '8941971a8f2e24b9a84fe29f128d13ceb89c0a65'

2013-11-14 13:14:41 +01:00

libavdevice

lavd/xv: fix memory leak

2013-11-13 11:34:19 +01:00

libavfilter

lavfi: add elbg filter

2013-11-13 11:21:57 +01:00

libavformat

avformat/nullenc: mark null as VFPS

2013-11-13 22:56:18 +01:00

libavresample

Merge commit '211ca69b13eb0a127a9ef7e70ddaccdab125d1c5'

2013-10-28 09:59:53 +01:00

libavutil

Merge remote-tracking branch 'qatar/master'

2013-11-14 03:26:35 +01:00

libpostproc

postprocess_template: put rsp on the clobber list to prevent gcc from using it in "q"

2013-06-16 18:21:39 +02:00

libswresample

lswr: fix assert failure on unknown layouts.

2013-11-03 10:30:37 +01:00

libswscale

lsws/utils: introduce scale_algorithms array

2013-11-05 14:01:53 +01:00

presets

presets: specify the codecs.

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

tests

fate: Add VCR2 test

2013-11-14 08:49:31 +01:00

tools

tools/probetest: also print the time the probe functions needed

2013-11-08 22:33:52 +01:00

.gitignore

doc/examples: rename demuxing to demuxing_decoding.

2013-11-04 12:53:06 +01:00

arch.mak

Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'

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

Changelog

lavfi: add elbg filter

2013-11-13 11:21:57 +01:00

cmdutils_common_opts.h

cmdutils: add -colors option

2013-10-27 09:18:45 +01:00

cmdutils.c

cmdutils: fix expected signature for show_colors() function

2013-10-28 09:41:25 +01:00

cmdutils.h

cmdutils: fix expected signature for show_colors() function

2013-10-28 09:41:25 +01:00

common.mak

Merge commit '47b6cfc2a0333fb24f074d27830bf35ae5007050'

2013-10-04 11:49:01 +02:00

configure

Merge commit '16381923fb7b9087ce559fb1cd3594469ac6788b'

2013-11-14 02:34:34 +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

ffmpeg_filter: Fix non jpeg yuv in jpeg support

2013-10-27 17:41:06 +01:00

ffmpeg_opt.c

ffmpeg_opt: fix overriding values set by -target

2013-11-13 22:07:19 +01:00

ffmpeg.c

ffmpeg: remove unneeded include "libswscale/swscale.h"

2013-11-10 21:45:19 +01:00

ffmpeg.h

ffmpeg: store value of -filter and -filter_script per-stream option in OutputStream struct

2013-11-09 19:05:34 +01:00

ffplay.c

ffplay: add smarter method for determining video picture duration

2013-11-05 21:27:07 +01:00

ffprobe.c

ffprobe: fix consistency checks in parse_read_intervals()

2013-10-21 13:33:06 +02:00

ffserver.c

ffserver: strip odd chars from html error messages before sending them back

2013-10-09 00:30:46 +02:00

INSTALL

…

library.mak

build: remove pointless condition

2013-10-29 14:00:29 +00:00

LICENSE

libavfilter/vf_noise: relicense to LGPL

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

MAINTAINERS

MAINTAINERS: Add 1.2 back to the maintained releases

2013-11-12 14:33:54 +01:00

Makefile

Merge remote-tracking branch 'qatar/master'

2013-11-04 01:20:46 +01:00

README

…

RELEASE

Update for 2.0

2013-07-10 02:15:43 +02:00

version.sh

…

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 89.7%

Assembly 8.2%

Makefile 1.3%

C++ 0.3%

Objective-C 0.1%

Other 0.1%