ffmpeg

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

T

Michael Niedermayer 5a3c8f95d5 Merge commit '5bee21d724dc47d115faae3f5065a6db74e1594a' into release/1.1

* commit '5bee21d724dc47d115faae3f5065a6db74e1594a':
  vf_delogo: fix copying the input frame.
  vf_delogo: fix an uninitialized read.
  dnxhdenc: fix invalid reads in dnxhd_mb_var_thread().
  atrac3: use correct loop variable in add_tonal_components()

Conflicts:
	libavfilter/vf_delogo.c
	tests/ref/vsynth/vsynth1-dnxhd-1080i
	tests/ref/vsynth/vsynth2-dnxhd-1080i

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

2013-02-14 12:27:48 +01:00

compat

Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff'

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

doc

update for 1.1.2

2013-02-06 02:02:35 +01:00

libavcodec

Merge commit '5bee21d724dc47d115faae3f5065a6db74e1594a' into release/1.1

2013-02-14 12:27:48 +01:00

libavdevice

Merge remote-tracking branch 'qatar/release/9' into release/1.1

2013-01-19 15:54:36 +01:00

libavfilter

vf_delogo: fix copying the input frame.

2013-02-07 07:18:56 +01:00

libavformat

lavf/mov: skip version and flags attributes in mov_read_chan function

2013-02-06 23:24:19 +01:00

libavresample

Merge remote-tracking branch 'qatar/release/9' into release/1.1

2013-02-05 16:28:36 +01:00

libavutil

lavu: test for broken binutils on ARM

2013-01-05 16:25:37 +01:00

libpostproc

build: postproc cleanup.

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

libswresample

swr: fix handling of timestamps that cause multiple drops or silence injections

2013-01-18 05:14:30 +01:00

libswscale

Merge remote-tracking branch 'qatar/master'

2013-01-05 13:37:30 +01:00

presets

…

tests

Merge commit '5bee21d724dc47d115faae3f5065a6db74e1594a' into release/1.1

2013-02-14 12:27:48 +01:00

tools

Fix "knwon" typo and add a check in tools/patcheck

2013-01-04 19:24:37 +00: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

Changelog

Merge remote-tracking branch 'qatar/release/9' into release/1.1

2013-01-17 04:26:42 +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 2013

2013-01-03 13:35:12 +02:00

cmdutils.h

Merge commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011'

2012-12-20 12:06:15 +01:00

common.mak

Merge remote-tracking branch 'qatar/master'

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

configure

Merge remote-tracking branch 'qatar/release/9' into release/1.1

2013-01-19 15:54:36 +01:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

COPYING.LGPLv3

…

CREDITS

…

ffmpeg_filter.c

ffmpeg: sub2video: set resample size.

2013-01-01 23:06:34 +01:00

ffmpeg_opt.c

ffmpeg: dont allow -flags to override -pass

2013-02-06 02:03:05 +01:00

ffmpeg.c

ffmpeg: do not call exit from exit_program()

2013-02-06 04:15:48 +01:00

ffmpeg.h

Merge commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06'

2012-12-20 02:38:02 +01: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: add missing padding to extradata.

2012-12-30 22:22:18 +01: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: add 1.1, remove 0.10

2013-01-06 21:42:35 +01:00

Makefile

Merge remote-tracking branch 'qatar/master'

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

README

…

RELEASE

update for 1.1.2

2013-02-06 02:02:35 +01:00

VERSION

update for 1.1.2

2013-02-06 02:02:35 +01: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.1%

Assembly 8.4%

Makefile 1.4%

GLSL 0.3%

C++ 0.3%

Other 0.2%