FFmpeg

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

Go to file

Michael Niedermayer b7d8484f27 Merge commit 'b8f3ab8e6a7ce3627764da53b809628c828d4047'

* commit 'b8f3ab8e6a7ce3627764da53b809628c828d4047':
  ac3dec: output planar float only
  svq3: make slice type value unsigned to match svq3_get_ue_golomb return type
  configure: Have protocols select network code instead of depending on it

Conflicts:
	libavcodec/svq3.c

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

2012-12-10 01:32:37 +01:00

compat

Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff'

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

doc

lavf: TED Talks JSON captions demuxer.

2012-12-09 18:50:38 +01:00

libavcodec

Merge commit 'b8f3ab8e6a7ce3627764da53b809628c828d4047'

2012-12-10 01:32:37 +01:00

libavdevice

dshow: fix return code when opening device

2012-12-08 21:44:30 +01:00

libavfilter

lavfi/setfield: add support to named options and introspection

2012-12-08 18:26:32 +01:00

libavformat

Merge commit '5d471b73d20616f5ac701ff62e5de49465cda264'

2012-12-10 01:27:10 +01:00

libavresample

Merge commit 'f5fa03660db16f9d78abc5a626438b4d0b54f563'

2012-11-28 13:27:18 +01:00

libavutil

lavu/opt: change the way ranges are printed

2012-12-08 22:18:38 +01:00

libpostproc

pp: add SSE2 deInterlaceInterpolateCubic().

2012-11-18 16:21:59 +01:00

libswresample

resample: remove disabled debug code

2012-12-06 02:51:26 +01:00

libswscale

sws_scale: check input against NULL

2012-12-07 21:50:07 +01:00

presets

presets: specify the codecs.

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

tests

Flip zerocodec output.

2012-12-09 10:24:16 +01:00

tools

lavf: TED Talks JSON captions demuxer.

2012-12-09 18:50:38 +01:00

.gitignore

Add examples/resampling_audio to .gitignore.

2012-12-06 12:13:01 +01:00

arch.mak

Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'

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

Changelog

lavf: TED Talks JSON captions demuxer.

2012-12-09 18:50:38 +01:00

cmdutils_common_opts.h

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

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

cmdutils.c

Merge commit 'ff953fecffd3b9a616a046723fb9d4690be032a6'

2012-12-05 15:58:07 +01:00

cmdutils.h

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

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

common.mak

Merge commit '4a606c830ae664013cea33800094d4d0f4ec62da'

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

configure

Merge commit 'b8f3ab8e6a7ce3627764da53b809628c828d4047'

2012-12-10 01:32:37 +01:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

COPYING.LGPLv3

…

CREDITS

…

ffmpeg_filter.c

Merge commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56'

2012-12-06 15:55:47 +01:00

ffmpeg_opt.c

ffmpeg: use avformat_seek_file() instead of av_seek_frame().

2012-12-02 00:06:02 +01:00

ffmpeg.c

ffmpeg: small indent fix.

2012-12-04 16:40:11 +01:00

ffmpeg.h

ffmpeg: fix swr filter_type for auto inserted aresample filters

2012-11-26 04:06:19 +01:00

ffplay.c

Merge remote-tracking branch 'qatar/master'

2012-11-29 14:22:58 +01:00

ffprobe.c

ffprobe: free dictionary in opt_show_entries()

2012-11-23 18:49:26 +01:00

ffserver.c

ffserver: set oformat

2012-12-09 23:39:06 +01:00

INSTALL

…

library.mak

Merge commit '4a606c830ae664013cea33800094d4d0f4ec62da'

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

LICENSE

lavfi: add geq filter.

2012-11-11 23:12:54 +01:00

MAINTAINERS

MAINTAINERS: add myself for my works

2012-12-08 15:18:08 +00:00

Makefile

Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'

2012-12-08 14:24:16 +01: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

…

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%