ffmpeg

Go to file

Michael Niedermayer 8d193a24f2 Merge commit '730bac7bab3c7dcd9fcb7c70f154e5f4cfaef9a7'

* commit '730bac7bab3c7dcd9fcb7c70f154e5f4cfaef9a7':
  mss4: use the AVFrame API properly.
  mss3: use the AVFrame API properly.
  mss2: use the AVFrame API properly.
  mss1: use the AVFrame API properly.

Conflicts:
	libavcodec/mss1.c
	libavcodec/mss2.c
	libavcodec/mss3.c
	libavcodec/mss4.c

See: 02fe531afefa7ac3fcc552f8e83461a4bfa7f868
See: ff1c13b133d548b3ce103f91999b6cc1bb7e65cc
See: 310bf283542ff81a9ec8fa7492fe7d625e80562f
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2013-11-17 02:48:17 +01:00

compat

Merge remote-tracking branch 'qatar/master'

2013-11-07 23:39:31 +01:00

doc

Merge commit '5b9c3b4505206143d85398c1410949319fa1180f'

2013-11-16 23:54:10 +01:00

libavcodec

Merge commit '730bac7bab3c7dcd9fcb7c70f154e5f4cfaef9a7'

2013-11-17 02:48:17 +01:00

libavdevice

lavd/xv: free resources on errors

2013-11-15 09:56:58 +01:00

libavfilter

Merge commit '5b9c3b4505206143d85398c1410949319fa1180f'

2013-11-16 23:54:10 +01:00

libavformat

Merge commit '5b9c3b4505206143d85398c1410949319fa1180f'

2013-11-16 23:54:10 +01:00

libavresample

Merge commit '211ca69b13eb0a127a9ef7e70ddaccdab125d1c5'

2013-10-28 09:59:53 +01:00

libavutil

Merge commit 'cce3e0a49f0dd030262c28d9c53de0bd2fd909c4'

2013-11-14 15:04:04 +01: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

lswr: fix assert failure on unknown layouts.

2013-11-03 10:30:37 +01:00

libswscale

swscale/swscale_unscaled: fix right column handling in planarCopyWrapper

2013-11-16 21:15:05 +01:00

presets

presets: specify the codecs.

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

tests

Merge commit '952f943d40e9dbcd68bc851460cc99268091a294'

2013-11-17 01:22:35 +01:00

tools

tools/probetest: also print the time the probe functions needed

2013-11-08 22:33:52 +01:00

.gitignore

doc/examples: rename demuxing to demuxing_decoding.

2013-11-04 12:53:06 +01:00

arch.mak

Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'

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

Changelog

lavc: VP9 decoder

2013-11-15 10:16:28 +01:00

cmdutils_common_opts.h

cmdutils: add -colors option

2013-10-27 09:18:45 +01:00

cmdutils.c

cmdutils: fix expected signature for show_colors() function

2013-10-28 09:41:25 +01:00

cmdutils.h

cmdutils: fix expected signature for show_colors() function

2013-10-28 09:41:25 +01:00

common.mak

Merge commit 'e8fcdebb17fc59375fd9fc6c0a02a1d2e6d9fb23'

2013-11-15 12:19:45 +01:00

configure

lavc: VP9 decoder

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

CREDITS: redirect to Git log, remove current outdated content

2013-01-31 18:02:52 +01:00

ffmpeg_filter.c

ffmpeg_filter: Fix non jpeg yuv in jpeg support

2013-10-27 17:41:06 +01:00

ffmpeg_opt.c

ffmpeg: Do not fill gap before the first decodable frame on single stream input files unless the user explicitly requests it.

2013-11-16 14:27:29 +01:00

ffmpeg.c

Merge commit '5b9c3b4505206143d85398c1410949319fa1180f'

2013-11-16 23:54:10 +01:00

ffmpeg.h

ffmpeg: Do not fill gap before the first decodable frame on single stream input files unless the user explicitly requests it.

2013-11-16 14:27:29 +01:00

ffplay.c

Merge commit '5b9c3b4505206143d85398c1410949319fa1180f'

2013-11-16 23:54:10 +01:00

ffprobe.c

ffprobe: fix consistency checks in parse_read_intervals()

2013-10-21 13:33:06 +02:00

ffserver.c

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

2013-10-09 00:30:46 +02:00

INSTALL

Merge remote branch 'qatar/master'

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

library.mak

build: remove pointless condition

2013-10-29 14:00:29 +00:00

LICENSE

libavfilter/vf_noise: relicense to LGPL

2013-10-27 20:29:07 +00:00

MAINTAINERS

MAINTAINERS: Add 1.2 back to the maintained releases

2013-11-12 14:33:54 +01:00

Makefile

Merge remote-tracking branch 'qatar/master'

2013-11-04 01:20:46 +01: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

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%