FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00

Go to file

Michael Niedermayer 1b5a6d3c49 Merge remote-tracking branch 'qatar/master'

* qatar/master:
  flacenc: ensure the order is within the min/max range in LPC order search
  avconv: rescale packet duration to muxer time base when flushing encoders
  add 24-bit FLAC encoding to Changelog
  rtpenc_aac: Fix calculation of the header size
  x86: h264_intrapred: port to cpuflags

Conflicts:
	Changelog
	libavformat/rtpenc_aac.c

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

2012-11-09 10:29:51 +01:00

compat

Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff'

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

doc

doc/faq: explain libfoo-dev packages.

2012-11-08 21:05:10 +01:00

libavcodec

Merge remote-tracking branch 'qatar/master'

2012-11-09 10:29:51 +01:00

libavdevice

oss: warn when non block mode cannot be enabled.

2012-11-05 00:28:21 +01:00

libavfilter

lavfi/movie: return proper error code in case of av_get_token() allocation failure

2012-11-06 23:31:16 +01:00

libavformat

Merge remote-tracking branch 'qatar/master'

2012-11-09 10:29:51 +01:00

libavresample

Merge remote-tracking branch 'qatar/master'

2012-11-06 15:11:53 +01:00

libavutil

lavu: remove disabled FF_API_OLD_EVAL_NAMES code

2012-11-07 23:18:05 +01:00

libpostproc

pp: avoid overflow in w*h

2012-10-13 21:17:43 +02:00

libswresample

lswr/swresample: adopt globally consistent rules for options help message

2012-11-03 20:38:02 +01:00

libswscale

Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415'

2012-11-01 13:11:51 +01:00

presets

presets: specify the codecs.

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

tests

fate-rsync: replace -a by -rlt

2012-11-07 18:33:52 +01:00

tools

probetest: fix possible use of uninitialized data

2012-10-31 13:16:52 +01:00

.gitignore

.gitignore: ignore *.3 files as well

2012-11-06 12:24:12 +01:00

arch.mak

Merge commit 'ca411fc1d34329cd17b28627f697e391ae52073f'

2012-10-13 15:25:11 +02:00

Changelog

Merge remote-tracking branch 'qatar/master'

2012-11-09 10:29:51 +01:00

cmdutils_common_opts.h

Revert "cmdutils: allow specifying the file for -report"

2012-11-04 10:47:52 +01:00

cmdutils.c

PRINT_CODEC_SUPPORTED: fix used variable

2012-11-09 03:08:29 +01:00

cmdutils.h

Revert "cmdutils: allow specifying the file for -report"

2012-11-04 10:47:52 +01:00

common.mak

Merge commit '04581c8c77ce779e4e70684ac45302972766be0f'

2012-10-31 13:57:09 +01:00

configure

libvpxenc: Allow enabling constrained quality (CQ) mode

2012-11-08 00:01:54 +02:00

COPYING.GPLv2

…

COPYING.GPLv3

Add configure option to upgrade (L)GPL to version 3.

2009-06-05 11:04:03 +00:00

COPYING.LGPLv2.1

cosmetics: Delete empty lines at end of file.

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

COPYING.LGPLv3

Add configure option to upgrade (L)GPL to version 3.

2009-06-05 11:04:03 +00:00

CREDITS

Revert "partially rename FFmpeg to Libav"

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

ffmpeg_filter.c

ffmpeg: fix negative array index

2012-10-22 13:58:19 +02:00

ffmpeg_opt.c

ffmpeg: complain loudly and exit in case removed -sameq option is specified

2012-11-03 12:05:43 +01:00

ffmpeg.c

Fix the packet duration when flushing the encoder.

2012-11-07 22:29:11 +01:00

ffmpeg.h

ffmpeg: use av_rescale_delta() on the audio filter input

2012-10-27 00:26:35 +02:00

ffplay.c

ffplay: adjust external clock speed based on buffer fullness for realtime sources

2012-11-04 18:29:49 +01:00

ffprobe.c

ffprobe: fix potential NULL pointer dereference

2012-11-06 22:59:24 +01:00

ffserver.c

ffserver: zero dest_addr

2012-11-04 13:00:20 +01:00

INSTALL

Merge remote branch 'qatar/master'

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

library.mak

Merge remote-tracking branch 'qatar/master'

2012-11-03 14:48:51 +01:00

LICENSE

lavfi/hue: add missing GPL dependency.

2012-10-31 19:28:02 +01:00

MAINTAINERS

MAINTAINERS: fix entry for img2

2012-11-06 01:46:21 +01:00

Makefile

Merge remote-tracking branch 'qatar/master'

2012-10-26 15:20:48 +02:00

README

README: be a tiny bit more verbose

2012-04-06 10:23:26 +02:00

RELEASE

Merge commit 'ceb754d041f5f6327fd9195a5f43575af9516daa'

2012-10-24 14:01:36 +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 90.1%

Assembly 7.9%

Makefile 1.3%

C++ 0.2%

Objective-C 0.2%

Other 0.1%