FFmpeg

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

Go to file

Michael Niedermayer 40e8967ee1 Merge commit '22e76ec635bafdd1d1ec35581a7ac09e69e3c43e'

* commit '22e76ec635bafdd1d1ec35581a7ac09e69e3c43e':
  atrac3: set the getbits context the right buffer_end
  atrac3: fix error handling

Conflicts:
	libavcodec/atrac3.c

No change as these issues have been fixed previously
See: c8f25cafd2
See: 5eaed6d336

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

2013-07-10 12:23:17 +02:00

compat

Merge remote-tracking branch 'qatar/master'

2013-07-05 13:11:06 +02:00

doc

Update back for git master

2013-07-10 03:14:23 +02:00

libavcodec

atrac3: fix error handling

2013-07-10 02:15:43 +02:00

libavdevice

avformat/AVFormatContext: Move fields down to match the fork

2013-07-09 19:06:32 +02:00

libavfilter

avfilter/graphparse: Fix build with --enable-incompatible-fork-abi

2013-07-09 19:06:32 +02:00

libavformat

avformat/utils: avformat_find_stream_info fix a crash in case of oom

2013-07-10 03:42:06 +02:00

libavresample

Merge commit '006ec64877fb638de4b15ae5fd969e22bd0f60ca'

2013-05-18 11:25:58 +02:00

libavutil

Merge commit '6516632967da5e6bd7d6136e8678f826669ed26e'

2013-07-07 11:26:28 +02: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

cosmetics: Fix "dont" "wont" "doesnt" typos

2013-06-29 02:31:16 +02:00

libswscale

swscale: treat gray as a fullrage (0-255) format

2013-07-08 15:21:48 +02:00

presets

presets: specify the codecs.

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

tests

tests/fate/filter-audio: update asyncts reference

2013-07-08 19:44:27 +02:00

tools

Merge commit 'a4baf96abd64cda68e3e4692b182bdf60745a14d'

2013-07-07 11:35:59 +02:00

.gitignore

Rename ffadler to ffhash and expand it using the generic hash API

2013-05-16 17:58:56 +02:00

arch.mak

Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'

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

Changelog

Changelog: add back the <next> placeholder for new changes

2013-07-10 03:14:33 +02:00

cmdutils_common_opts.h

cmdutils_common_opts: fix indention of #if

2013-04-11 16:07:46 +02:00

cmdutils.c

cmdutils: replace exit() by exit_program()

2013-07-08 11:12:32 +02:00

cmdutils.h

Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb'

2013-07-08 04:34:11 +02:00

common.mak

Merge commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975'

2013-03-28 12:12:38 +01:00

configure

Merge remote-tracking branch 'qatar/master'

2013-07-05 13:11:06 +02:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

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: replace exit() by exit_program()

2013-07-08 11:09:22 +02:00

ffmpeg_opt.c

ffmpeg_opt: do not warn about unused gop_timecode

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

ffmpeg.c

Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb'

2013-07-08 04:34:11 +02:00

ffmpeg.h

ffmpeg: add -apad option which injects a apad filter only in the presence of video streams

2013-05-08 23:55:06 +02:00

ffplay.c

ffplay: assume 0 stream start time if start time is unset in duration check

2013-07-09 20:19:54 +02:00

ffprobe.c

Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb'

2013-07-08 04:34:11 +02:00

ffserver.c

ffserver: fix null pointer dereference

2013-06-04 13:19:27 +02:00

INSTALL

…

library.mak

Merge commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975'

2013-03-28 12:12:38 +01:00

LICENSE

lavfi: add spp filter.

2013-06-14 01:27:22 +02:00

MAINTAINERS

MAINTAINERS: Update which releases are supported

2013-07-10 00:47:01 +02:00

Makefile

Merge commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d'

2013-05-24 13:01:41 +02: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

…

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%