FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00

Go to file

Michael Niedermayer 3d3a7f5034 Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpegvideo: Drop a faulty assert

Conflicts:
	libavcodec/mpegvideo.c

Merge for metadata only, the change looks wrong.

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

2013-10-23 13:04:30 +02:00

compat

Merge commit 'ef51692a49d58963966adca55c62da9c34c3c7e1'

2013-08-28 12:46:12 +02:00

doc

avplay: Accept cpuflags option

2013-10-22 10:49:31 +02:00

libavcodec

avcodec/aacdec: fix more avpriv_report_missing_feature() arguments

2013-10-23 10:57:16 +02:00

libavdevice

lavd/pulse_audio_enc: add support for flushing

2013-10-20 19:15:30 +02:00

libavfilter

Merge commit 'f6633c55a3c0e93a5b2bab6aa0692fb608f2a38d'

2013-10-23 12:14:49 +02:00

libavformat

Merge commit 'e01fba5562133ac56a4f44c6f214a80ee33cb388'

2013-10-23 12:05:48 +02:00

libavresample

Merge commit '206895708ea2b464755d340e44501daf9a07c310'

2013-10-14 15:54:23 +02:00

libavutil

Support FF_DISABLE_DEPRECATION_WARNINGS with icc on Linux.

2013-10-21 13:49:30 +02: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/swresample: convert ocl and icl options to AV_OPT_TYPE_CHANNEL_LAYOUT

2013-10-17 18:09:54 +02:00

libswscale

swscale/utils: check mprotect() return code

2013-10-23 10:14:05 +02:00

presets

…

tests

Merge remote-tracking branch 'qatar/master'

2013-10-22 19:43:32 +02:00

tools

Merge remote-tracking branch 'qatar/master'

2013-10-05 11:35:39 +02:00

.gitignore

tools: add benchmark for crypto functions.

2013-09-04 16:36:11 +02:00

arch.mak

…

Changelog

movenc: Add an F4V muxer

2013-10-23 11:17:03 +03:00

cmdutils_common_opts.h

Merge commit 'f825d42bccdb9f89669a586951de7f66a81e80a5'

2013-10-22 19:07:28 +02:00

cmdutils.c

Merge commit 'f825d42bccdb9f89669a586951de7f66a81e80a5'

2013-10-22 19:07:28 +02:00

cmdutils.h

Merge commit 'f825d42bccdb9f89669a586951de7f66a81e80a5'

2013-10-22 19:07:28 +02:00

common.mak

Merge commit '47b6cfc2a0333fb24f074d27830bf35ae5007050'

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

configure

movenc: Add an F4V muxer

2013-10-23 11:17:03 +03:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

COPYING.LGPLv3

…

CREDITS

…

ffmpeg_filter.c

ffmpeg_filter: check that the input media type match the filter

2013-08-14 03:03:41 +02:00

ffmpeg_opt.c

make it possible to compile ffmpeg without swscale

2013-10-21 13:57:00 +00:00

ffmpeg.c

ffmpeg: Dont crash on unconnected output pads before an error is printed

2013-10-23 11:39:43 +02:00

ffmpeg.h

ffmpeg: add max_error_rate to allow tuning the point decoding errors are considered a failure of the whole transcoding.

2013-10-07 23:58:59 +02:00

ffplay.c

ffplay: add support for changing the channel by the C key

2013-10-13 12:46:14 +02: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

Merge commit 'e52567c2954f627d420b30f75f71af2f2e4afe80'

2013-10-08 10:45:37 +02:00

LICENSE

avfilter: port pullup filter from libmpcodecs

2013-09-17 17:03:36 +00:00

MAINTAINERS

MAINTAINERS: add lavd/fbdev_enc entry

2013-10-20 19:23:31 +02:00

Makefile

Merge commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d'

2013-05-24 13:01:41 +02: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 90.3%

Assembly 7.8%

Makefile 1.3%

C++ 0.2%

Objective-C 0.2%

Other 0.1%