ffmpeg

mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-11-13 00:42:49 +03:00

Go to file

Michael Niedermayer be26232efa Merge commit '07acdd651d1e2f4cfa5f610e616e70e323bb69cd'

* commit '07acdd651d1e2f4cfa5f610e616e70e323bb69cd':
  ivi_common: use proper logging context in ivi_decode_blocks().
  ivi_common: make some functions and tables static.
  asyncts: ignore min_delta only if first_pts is set

Conflicts:
	libavcodec/ivi_common.c
	libavcodec/ivi_common.h

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

2012-12-14 15:56:56 +01:00

compat

Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff'

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

doc

Merge commit 'b35e5d985dd12acf9a0aaa52334134edcf35d68e'

2012-12-14 13:58:12 +01:00

libavcodec

Merge commit '07acdd651d1e2f4cfa5f610e616e70e323bb69cd'

2012-12-14 15:56:56 +01:00

libavdevice

dshow: fix return code when opening device

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

libavfilter

Merge commit '07acdd651d1e2f4cfa5f610e616e70e323bb69cd'

2012-12-14 15:56:56 +01:00

libavformat

sauce: test filetype correctly for datatype 5 (binary text)

2012-12-14 16:46:29 +11:00

libavresample

Merge remote-tracking branch 'qatar/master'

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

libavutil

Merge commit 'c0dc57f1264dad1e121772d03abdb9e14ed8857f'

2012-12-14 15:43:46 +01:00

libpostproc

doxy: add ref for lavfi, lpp and lsws.

2012-12-11 02:13:43 +01:00

libswresample

audioconvert/arm: require alignment of 16

2012-12-14 04:49:09 +01:00

libswscale

doxy: add ref for lavfi, lpp and lsws.

2012-12-11 02:13:43 +01:00

presets

presets: specify the codecs.

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

tests

fate: add BRSTM demuxer test

2012-12-11 11:34:47 +00:00

tools

qt-faststart: Check offset_count

2012-12-13 15:07:20 +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

lavfi: add aselect audio variant of select

2012-12-13 00:10:24 +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 remote-tracking branch 'qatar/master'

2012-12-11 08:24:45 +01:00

configure

configure/arm: print if thumb mode is enabled

2012-12-14 02:37:32 +01:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

cosmetics: Delete empty lines at end of file.

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

COPYING.LGPLv3

…

CREDITS

Revert "partially rename FFmpeg to Libav"

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

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: sub2video: use start and end time.

2012-12-12 15:05:50 +01:00

ffmpeg.h

ffmpeg: sub2video: use start and end time.

2012-12-12 15:05:50 +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

Merge remote branch 'qatar/master'

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

library.mak

Merge remote-tracking branch 'qatar/master'

2012-12-11 08:24:45 +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 remote-tracking branch 'qatar/master'

2012-12-11 08:24:45 +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

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.

Description

FFmpeg - это набор библиотек и инструментов для обработки мультимедийного контента, такого как аудио, видео, субтитры и связанные с ними метаданные

https://ffmpeg.org/

audio converter video

Readme 451 MiB

Languages

C 88.6%

Assembly 8.3%

Makefile 1.6%

GLSL 0.4%

C++ 0.3%

Other 0.6%