ffmpeg

Go to file

Michael Niedermayer eb3330b050 Merge remote-tracking branch 'TimothyGu/release/1.1' into release/1.1

* TimothyGu/release/1.1:
  doc/encoders: add doc for AAC encoder
  doc/ffmpeg-formats: Add documentation for 2 parameters that have been missing
  doc/encoders: improve libvo-aacenc doc
  doc/encoders: Remove options that were not there when branch was cut from master
  doc/encoders: reformat and add some clarification in libtwolame doc
  doc/encoders: reformat libmp3lame doc

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

2013-10-11 15:28:11 +02:00

compat

Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff'

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

doc

doc/encoders: add doc for AAC encoder

2013-09-22 15:22:34 -07:00

libavcodec

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

2013-10-08 02:11:31 +02:00

libavdevice

Read h264 headers from v4l2 to allow stream-copying.

2013-09-05 23:08:32 +02:00

libavfilter

avfilter/vf_fps: make sure the fifo is not empty before using it

2013-09-07 12:54:40 +02:00

libavformat

Merge commit '494f2d4f9e834db1eaf1a7d0160d497f9802013d' into release/1.1

2013-10-08 02:03:40 +02:00

libavresample

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

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

libavutil

pixdesc: mark gray8 as pseudopal

2013-05-31 23:00:31 +02:00

libpostproc

build: postproc cleanup.

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

libswresample

swr/rematrix: Fix handling of AV_CH_LAYOUT_STEREO_DOWNMIX output

2013-08-20 18:45:21 +02:00

libswscale

Merge commit '1ab4578c88dc3e1407da15471bd323ba40c3ebbb' into release/1.1

2013-05-12 14:31:59 +02:00

presets

presets: specify the codecs.

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

tests

mxfdec: set audio timebase to 1/samplerate

2013-10-04 03:52:11 +02: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

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

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

Merge commit '05015d03da1d745bb92915b5cea92dec16af719f' into release/1.1

2013-05-12 12:49:36 +02:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

cosmetics: Delete empty lines at end of file.

2012-02-09 12:26:45 +01:00

COPYING.LGPLv3

…

CREDITS

Revert "partially rename FFmpeg to Libav"

2011-03-17 17:26:45 +01:00

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

Merge commit 'fa6eef4210c2fd7f7324d558b09311c75987a31e' into release/1.1

2013-08-27 16:30:57 +02: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: strip odd chars from html error messages before sending them back

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

INSTALL

Merge remote branch 'qatar/master'

2011-04-08 02:50:13 +02:00

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.10 RELEASE

2013-10-04 19:14:27 -04:00

VERSION

update for 1.1.6

2013-08-31 04:55:35 +02:00

version.sh

version.sh: handle shallow clones and snapshots.

2011-07-22 10:43: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 92.1%

Assembly 6%

Makefile 1.2%

C++ 0.3%

Objective-C 0.2%

Other 0.1%