FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00

Go to file

Michael Niedermayer b28c371567 Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavf/concatdec: reindent after last commit.
  lavf/concatdec: more reliable test for absolute URLs.
  lavf: add subfile protocol.
  lavfi/af_atempo: clear references before returning error.
  lavd/xv: take aspect ratio into account.
  lavc/pthread: copy packet side data.

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

2014-03-08 15:00:36 +01:00

compat

Correct the FSF address for two avisynth files to '51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA'

2014-03-06 20:44:33 +01:00

doc

lavf: add subfile protocol.

2014-03-08 12:36:57 +01:00

libavcodec

lavc/pthread: copy packet side data.

2014-03-08 12:27:02 +01:00

libavdevice

Merge remote-tracking branch 'cigaes/master'

2014-03-08 15:00:36 +01:00

libavfilter

lavfi/af_atempo: clear references before returning error.

2014-03-08 12:31:00 +01:00

libavformat

lavf/concatdec: reindent after last commit.

2014-03-08 12:44:45 +01:00

libavresample

Merge remote-tracking branch 'qatar/master'

2014-02-22 21:12:02 +01:00

libavutil

Merge commit '93d216d37a3f95190ecb9d51cf72f54ea4e04ec7'

2014-03-07 12:44:09 +01:00

libpostproc

…

libswresample

swr: check that the context for swr_convert() has been initialized

2014-02-24 08:23:42 +01:00

libswscale

libswscale: bayer to rgb24 & yv12 colorspace converters

2014-02-23 02:38:22 +01:00

presets

…

tests

mxf: Set audio packets pts

2014-03-06 19:28:20 +01:00

tools

Merge commit 'ea7f79f93796d68559a495be824b6bbd94dfe5f6'

2014-03-01 14:44:58 +01:00

.gitignore

Merge commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a'

2014-02-25 20:26:00 +01:00

arch.mak

…

Changelog

lavf: add subfile protocol.

2014-03-08 12:36:57 +01:00

cmdutils_common_opts.h

…

cmdutils_opencl.c

…

cmdutils.c

…

cmdutils.h

…

common.mak

…

configure

Merge remote-tracking branch 'qatar/master'

2014-03-07 00:15:49 +01:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

COPYING.LGPLv3

…

CREDITS

…

ffmpeg_filter.c

…

ffmpeg_opt.c

ffmpeg_opt: get_preset_file_2(): fix avio_open2() return code check

2014-02-25 00:05:37 +01:00

ffmpeg_vdpau.c

…

ffmpeg.c

ffmpeg: dont try to run the subtitle encoder on non subtitle streams

2014-03-03 21:06:24 +01:00

ffmpeg.h

Merge commit '67f2a688143b644f99360565a9f36c61a5f052e9'

2014-02-24 21:08:19 +01:00

ffplay.c

…

ffprobe.c

…

ffserver.c

…

INSTALL

…

library.mak

…

LICENSE

…

MAINTAINERS

update for 2.2

2014-03-01 03:34:59 +01:00

Makefile

…

README

…

RELEASE

RELEASE: update for 2.2

2014-03-01 17:09:12 +01: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%