FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-14 22:22:59 +02:00

Go to file

Michael Niedermayer 5864ce13d1 Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mp3dec: read Xing frame TOC index
  mp3dec: use named constants for Xing header flags
  libx264: add support for nal-hrd, required for Blu-ray streams.
  mov: support random access point grouping
  matroskadec: properly support BlockDuration

Conflicts:
	libavcodec/libx264.c
	libavformat/isom.h
	libavformat/matroskadec.c
	libavformat/mov.c
	libavformat/mp3dec.c

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

2012-09-20 21:46:35 +02:00

compat

compat/vsnprintf: return number of bytes required on truncation.

2012-09-15 19:46:54 -04:00

doc

doc/filters: clarify use of graph2dot

2012-09-19 11:50:09 +02:00

libavcodec

Merge remote-tracking branch 'qatar/master'

2012-09-20 21:46:35 +02:00

libavdevice

lavd/lavfi: push frames until the last sink is EOF

2012-09-20 12:13:17 +02:00

libavfilter

lavfi/select: make lavc dependency optional.

2012-09-20 18:45:47 +02:00

libavformat

Merge remote-tracking branch 'qatar/master'

2012-09-20 21:46:35 +02:00

libavresample

Merge remote-tracking branch 'qatar/master'

2012-09-14 14:13:38 +02:00

libavutil

av_des_init: suppress warning about unused parameter

2012-09-19 21:57:58 +02:00

libpostproc

postproc: Fix unprotected inline asm

2012-09-11 20:12:14 +02:00

libswresample

swr/resample: mark mm_flags as potentially unused

2012-09-13 19:31:02 +02:00

libswscale

swscale: change assert() to av_assert()

2012-09-18 05:19:11 +02:00

presets

…

tests

tests: add fate-ffprobe test

2012-09-20 12:13:18 +02:00

tools

Remove mt-work directory

2012-09-15 15:40:36 -04:00

.gitignore

gitignore: codec_names.h is no more

2012-09-07 14:59:01 +02:00

arch.mak

…

Changelog

Merge commit '07584eaf4a95db3f11d3bc411f9786932829e82b'

2012-09-13 15:22:16 +02:00

cmdutils_common_opts.h

cmdutils: add -layouts option.

2012-08-28 15:09:49 +02:00

cmdutils.c

Fix segfault with -filters option

2012-09-18 23:27:43 -05:00

cmdutils.h

Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5'

2012-08-31 13:01:30 +02:00

common.mak

Merge remote-tracking branch 'qatar/master'

2012-09-16 14:55:00 +02:00

configure

lavfi/select: make lavc dependency optional.

2012-09-20 18:45:47 +02:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

COPYING.LGPLv3

…

CREDITS

…

Doxyfile

Merge remote-tracking branch 'qatar/master'

2012-08-04 23:51:43 +02:00

ffmpeg_filter.c

Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521'

2012-09-18 14:45:44 +02:00

ffmpeg_opt.c

Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5'

2012-08-31 13:01:30 +02:00

ffmpeg.c

ffmpeg: use PTS from the AVSubtitle structure for sub2video.

2012-09-15 16:14:33 +02:00

ffmpeg.h

ffmpeg: use PTS from the AVSubtitle structure.

2012-09-15 16:14:33 +02:00

ffplay.c

ffplay: dont wait 100ms if data is not yet ready

2012-09-16 19:07:28 +02:00

ffprobe.c

ffprobe: fix CSV writer output

2012-09-19 11:50:05 +02:00

ffserver.c

ffserver: fix typo in log message

2012-09-18 21:11:06 -05:00

INSTALL

…

library.mak

Merge commit '581281e242609a222233a2e5538b89dfb88fb18e'

2012-09-20 03:20:29 +02:00

LICENSE

LICENSE: correct incorrect claims on *GPL incompatibility

2012-08-16 04:47:18 +02:00

MAINTAINERS

Add CPiA video decoder

2012-08-31 00:24:11 +02:00

Makefile

Makefile: remove old codec_names.h on distclean

2012-09-07 14:59:01 +02:00

README

…

RELEASE

…

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 90.3%

Assembly 7.8%

Makefile 1.3%

C++ 0.2%

Objective-C 0.2%

Other 0.1%