FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00

Go to file

Michael Niedermayer 82db8ee321 Merge commit 'fd41cb43702498948ff14ba8c284fd5c15fc729d'

* commit 'fd41cb43702498948ff14ba8c284fd5c15fc729d':
  avconv: improve sample format negotiation for decoder request
  Opus encoder using libopus
  mpegts: Drop pointless casting of hex_dump_debug arguments
  avformat: const correctness for av_hex_dump / av_hex_dump_log
  wmadec: Adjust debug printf argument length modifier

Conflicts:
	Changelog
	ffmpeg.c
	libavcodec/libopusdec.c
	libavcodec/version.h

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

2012-10-02 14:58:19 +02:00

compat

MinGW: Use our snprintf/vsnprintf when MinGW's is broken

2012-09-25 18:14:14 -04:00

doc

Merge commit 'fd41cb43702498948ff14ba8c284fd5c15fc729d'

2012-10-02 14:58:19 +02:00

libavcodec

Merge commit 'fd41cb43702498948ff14ba8c284fd5c15fc729d'

2012-10-02 14:58:19 +02:00

libavdevice

Merge remote-tracking branch 'qatar/master'

2012-10-01 16:12:38 +02:00

libavfilter

lavfi/transpose: add passthrough option

2012-10-02 09:43:06 +02:00

libavformat

Merge commit 'fd41cb43702498948ff14ba8c284fd5c15fc729d'

2012-10-02 14:58:19 +02:00

libavresample

Merge remote-tracking branch 'qatar/master'

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

libavutil

Move xGA font data from lavc to lavu.

2012-10-01 22:24:17 +02:00

libpostproc

postproc: Create version.h header

2012-09-28 15:06:26 +02:00

libswresample

Add missing version macros to libraries

2012-09-28 15:10:18 +02:00

libswscale

sws: drop unused variable

2012-09-30 23:14:20 +02:00

presets

…

tests

nutenc: choose for non audio streams a timebase with finer resolution.

2012-10-02 01:09:12 +02:00

tools

Merge remote-tracking branch 'qatar/master'

2012-10-01 16:12:38 +02:00

.gitignore

gitignore: codec_names.h is no more

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

arch.mak

…

Changelog

Merge commit 'fd41cb43702498948ff14ba8c284fd5c15fc729d'

2012-10-02 14:58:19 +02:00

cmdutils_common_opts.h

cmdutils: add -layouts option.

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

cmdutils.c

cmdutils: sort codec lists.

2012-09-23 21:05:29 +02: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

Merge commit 'fd41cb43702498948ff14ba8c284fd5c15fc729d'

2012-10-02 14:58:19 +02:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

COPYING.LGPLv3

…

CREDITS

…

Doxyfile

…

ffmpeg_filter.c

Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521'

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

ffmpeg_opt.c

ffmpeg: add option to control copying of frames prior to start.

2012-09-27 03:52:31 +02:00

ffmpeg.c

ffmpeg: print muxed packet sizes in debug output too

2012-10-02 02:14:02 +02:00

ffmpeg.h

ffmpeg: add option to control copying of frames prior to start.

2012-09-27 03:52:31 +02:00

ffplay.c

Merge commit '7751e4693dd10ec98c20fbd9887233b575034272'

2012-09-25 15:15:16 +02:00

ffprobe.c

ffprobe: extend disposition printing support

2012-09-30 12:22:19 +02:00

ffserver.c

Merge remote-tracking branch 'qatar/master'

2012-10-01 16:12:38 +02: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

MAINTAINERS: add 1.0

2012-09-27 01:48:14 +02:00

Makefile

Makefile: remove old codec_names.h on distclean

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

README

…

RELEASE

RELEASE: update for 1.0

2012-09-27 01:48:14 +02: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 90.3%

Assembly 7.8%

Makefile 1.3%

C++ 0.2%

Objective-C 0.2%

Other 0.1%