ffmpeg

mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-06-16 04:32:47 +02:00

T

Michael Niedermayer 7a6907fcc3 Merge commit 'ce424e57d629072652935501b439c1a6310c2089' into release/1.1

* commit 'ce424e57d629072652935501b439c1a6310c2089':
  mp3enc: fix a triggerable assert

Conflicts:
	libavformat/mp3enc.c

Changed code is not in FFmpeg

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

2014-12-21 04:22:30 +01:00

compat

Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff'

2012-10-24 13:42:58 +02:00

doc

Merge commit '9920a8a83f578821e00212da6b79c8997a725fa8' into release/1.1

2014-12-21 04:04:48 +01:00

libavcodec

avcodec/lcldec: fix decoding of YUV444 sample

2014-08-30 21:56:15 +02:00

libavdevice

Merge commit '124ec8b1303d4f29b833099ce9008e31ac6d7c86' into release/1.1

2014-08-30 21:07:56 +02:00

libavfilter

Merge commit '3a6bc3e381647bb4434317113f131f7e0ab5bf83' into release/1.1

2014-08-08 14:06:36 +02:00

libavformat

Merge commit '56ac2cbd0464e0146e62c91843e2b1f5e0908504' into release/1.1

2014-12-21 04:07:26 +01:00

libavresample

Merge commit 'dccac759d39e761398d3d4172ae0b98c0186efa5' into release/1.1

2014-04-21 17:13:58 +02:00

libavutil

avutil/cpu: force mmx on selection of higher x86 SIMD features

2014-06-25 23:15:37 +02:00

libpostproc

build: postproc cleanup.

2012-12-30 02:27:52 +01:00

libswresample

swresample: fix AV_CH_LAYOUT_STEREO_DOWNMIX input

2014-05-10 21:55:41 +02:00

libswscale

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

2014-05-10 21:55:41 +02:00

presets

presets: specify the codecs.

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

tests

Merge commit '58d7b835e3cec48ab5a2393405fe82dee72c06a0' into release/1.1

2014-08-08 14:14:06 +02:00

tools

Merge commit 'cb95c1935f43ee6ae7fd15439df0f674e809f180' into release/1.1

2014-04-21 13:32:22 +02:00

.gitignore

Add examples/resampling_audio to .gitignore.

2012-12-06 12:13:01 +01:00

arch.mak

Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'

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

cmdutils_common_opts.h

cmdutils: implement debug/fdebug log level update differently.

2012-12-20 02:38:18 +01:00

cmdutils.c

cmdutils: update copyright year to 2014.

2014-04-14 16:55:37 -04:00

cmdutils.h

cmdutils: avtool -> fftool

2013-05-13 00:45:09 +02:00

common.mak

Merge remote-tracking branch 'qatar/master'

2012-12-11 08:24:45 +01:00

configure

configure: use pkg-config to detect libbluray

2014-04-22 00:21:27 +02:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

COPYING.LGPLv3

…

CREDITS

…

ffmpeg_filter.c

ffmpeg_filter: fix pointer to local outside scope

2014-05-10 21:55:41 +02:00

ffmpeg_opt.c

Merge commit 'e1f0c41e1aa37a9c166c43abf1b526c796ed7649' into release/1.1

2014-08-30 20:58:53 +02:00

ffmpeg.c

Merge commit 'ba8ab4e7ae016cf970b0f335a7933f2db53784bc' into release/1.1

2014-06-20 01:11:54 +02:00

ffmpeg.h

Merge commit 'ba8ab4e7ae016cf970b0f335a7933f2db53784bc' into release/1.1

2014-06-20 01:11:54 +02:00

ffplay.c

Replace references to "que" with the appropriate word.

2013-01-03 00:21:47 +01:00

ffprobe.c

ffprobe: do not escape '"' between single quotes.

2013-01-01 13:32:51 +01:00

ffserver.c

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

2013-10-09 00:55:38 +02:00

INSTALL

…

library.mak

Merge remote-tracking branch 'qatar/master'

2012-12-11 08:24:45 +01:00

LICENSE

lavfi: add histeq filter

2013-01-05 10:25:32 +01:00

MAINTAINERS

MAINTAINERS: mention that people are welcome to pick up and maintain older releases

2013-03-18 03:35:47 +01:00

Makefile

Merge remote-tracking branch 'qatar/master'

2012-12-11 08:24:45 +01:00

README

README: be a tiny bit more verbose

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

RELEASE

Prepare for 9.17 release

2014-09-10 12:58:01 -07:00

version.sh

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

2014-08-30 21:44:59 +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 89.1%

Assembly 8.4%

Makefile 1.4%

GLSL 0.3%

C++ 0.3%

Other 0.2%