ffmpeg

mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-16 19:11:09 +01:00

Go to file

Michael Niedermayer b3c8fd1f0e Merge commit '1b0082eabcc98e079d33c61da4d30ded89de68a9' into release/1.1

* commit '1b0082eabcc98e079d33c61da4d30ded89de68a9':
  flvdec: Don't read the VP6 header byte when setting codec type based on metadata
  vorbisdec: Accept 0 amplitude_bits
  vorbisdec: Error on bark_map_size equal to 0.
  vorbisdec: Add missing checks
  ac3dec: validate channel output mode against channel count

Conflicts:
	libavcodec/ac3dec.c
	libavformat/flvdec.c

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

2013-03-03 11:56:42 +01:00

compat

Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff'

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

doc

doc/ffmpeg: remove non ascii char

2013-02-27 16:16:04 +01:00

libavcodec

Merge commit '1b0082eabcc98e079d33c61da4d30ded89de68a9' into release/1.1

2013-03-03 11:56:42 +01:00

libavdevice

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

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

libavfilter

vf_mp: Set pseudo pal

2013-02-23 22:18:38 +01:00

libavformat

Merge commit '1b0082eabcc98e079d33c61da4d30ded89de68a9' into release/1.1

2013-03-03 11:56:42 +01:00

libavresample

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

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

libavutil

av_memcpy_backptr: avoid an infinite loop for back = 0

2013-02-23 14:40:30 +01:00

libpostproc

build: postproc cleanup.

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

libswresample

swr: check channel layouts before using them.

2013-02-19 01:31:25 +01:00

libswscale

sws: dont write out of array on bigendian

2013-02-14 14:17:21 +01:00

presets

…

tests

movenc: hotfix, dont store fiel for h264 / mpeg4-asp / dnxhd

2013-02-18 18:22:04 +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-02-26 03:09:41 +01:00

cmdutils_common_opts.h

cmdutils: implement debug/fdebug log level update differently.

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

cmdutils.c

Merge commit 'b7765d00f911fe0f8fcda21b93a540f27d2ba2f5' into release/1.1

2013-02-14 13:14:54 +01: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-02-19 01:19:31 +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

Prepare for 9.3 Release

2013-02-24 09:29:17 +01:00

VERSION

update for 1.1.3

2013-02-22 22:53:53 +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.8%

Assembly 8.1%

Makefile 1.3%

C++ 0.3%

Objective-C 0.1%

Other 0.1%