FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00

Go to file

Michael Niedermayer 5710f55e49 Merge commit '6b3ff6f91a535d6383f41ca7bdf760165dcb6015'

* commit '6b3ff6f91a535d6383f41ca7bdf760165dcb6015':
  swscale: provide a default scaler if none is set

Conflicts:
	libswscale/utils.c

The default is left at bicubic until someone has compared the scalers
properly speed and quality wise.

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

2013-10-06 11:44:05 +02:00

compat

Merge commit 'ef51692a49d58963966adca55c62da9c34c3c7e1'

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

doc

avfilter/vf_scale: change the default scaler to bicubic

2013-10-06 11:00:48 +02:00

libavcodec

Merge commit '258414d0771845d20f646ffe4d4e60f22fba217c'

2013-10-06 11:31:01 +02:00

libavdevice

avdevice/v4l: remove duplicate include

2013-09-21 15:36:33 +02:00

libavfilter

avfilter/vf_scale: change the default scaler to bicubic

2013-10-06 11:00:48 +02:00

libavformat

avformat/matroskadec: only set r_frame_rate if the value is within reasonable limits

2013-10-06 00:22:08 +02:00

libavresample

Reinstate proper FFmpeg license for all files.

2013-08-30 15:47:38 +00:00

libavutil

Merge commit '4272bb6ef1533846a788c259cc498562d0704444'

2013-10-06 11:16:15 +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

swr: fix example code and doxy indent.

2013-09-29 23:37:46 +02:00

libswscale

Merge commit '6b3ff6f91a535d6383f41ca7bdf760165dcb6015'

2013-10-06 11:44:05 +02:00

presets

presets: specify the codecs.

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

tests

avfilter/vf_scale: change the default scaler to bicubic

2013-10-06 11:00:48 +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

Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'

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

Changelog

Native VP9 decoder.

2013-10-02 21:03:11 -04:00

cmdutils_common_opts.h

cmdutils_common_opts: fix indention of #if

2013-04-11 16:07:46 +02:00

cmdutils.c

cmdutils: print command support in -filters.

2013-09-30 10:15:22 +00:00

cmdutils.h

Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb'

2013-07-08 04:34:11 +02:00

common.mak

Merge commit '47b6cfc2a0333fb24f074d27830bf35ae5007050'

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

configure

configure: add --tempprefix option

2013-10-05 18:43:21 +02: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: check that the input media type match the filter

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

ffmpeg_opt.c

ffmpeg: avoid direct access to lowres use av_codec_g/set_lowres()

2013-10-03 17:20:53 +02:00

ffmpeg.c

ffmpeg: dont return reserved values

2013-10-02 12:59:39 +02:00

ffmpeg.h

Merge commit '488a0fa68973d48e264d54f1722f7afb18afbea7'

2013-08-06 12:41:04 +02:00

ffplay.c

ffplay: avoid direct access to lowres use av_codec_g/set_lowres()

2013-10-03 22:38:54 +02:00

ffprobe.c

ffprobe: print stream channel_layout when available

2013-10-03 09:19:38 +02:00

ffserver.c

ffserver: allow choosing the pixel format

2013-09-14 03:51:45 +02:00

INSTALL

…

library.mak

Merge commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975'

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

LICENSE

avfilter: port pullup filter from libmpcodecs

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

MAINTAINERS

lavd/pulse: add MAINTAINERS entry

2013-10-04 23:26:40 +02:00

Makefile

Merge commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d'

2013-05-24 13:01:41 +02:00

README

README: be a tiny bit more verbose

2012-04-06 10:23:26 +02:00

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.1%

Assembly 7.9%

Makefile 1.3%

C++ 0.2%

Objective-C 0.2%

Other 0.1%