FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00

Go to file

Michael Niedermayer 5743095ca9 Merge commit '9d3009c6c4b9b6734f07df7c88f6a42ded6cdf38'

* commit '9d3009c6c4b9b6734f07df7c88f6a42ded6cdf38':
  avconv: print an error on applying options of the wrong type.
  atomic: Check for __sync_val_compare_and_swap instead of __sync_synchronize
  output-example: Update to use encode_video2 instead of the now dropped encode_video

Conflicts:
	doc/examples/muxing.c
	ffmpeg_opt.c
	libavutil/atomic.h

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

2013-03-12 18:10:35 +01:00

compat

compat/strtod: isspace -> av_isspace.

2013-03-04 03:37:36 +01:00

doc

Merge commit '9d3009c6c4b9b6734f07df7c88f6a42ded6cdf38'

2013-03-12 18:10:35 +01:00

libavcodec

pthread: fix unused variable warning

2013-03-12 18:10:09 +01:00

libavdevice

lavd/v4l2: fix bug in init_convert_timestamp()

2013-03-12 17:14:47 +01:00

libavfilter

Merge commit '7b89cd20d844cbe763ca34e63e99d110043cf241'

2013-03-12 15:44:15 +01:00

libavformat

lavf: add AV_ to two remaining CODEC_ID_*.

2013-03-12 16:21:22 +01:00

libavresample

Merge commit '45235ac488363e3360bf2f2275102d1ec66eba0f'

2013-02-24 17:45:06 +01:00

libavutil

Merge commit '7b89cd20d844cbe763ca34e63e99d110043cf241'

2013-03-12 15:44:15 +01:00

libpostproc

Fix libpostproc compilation on x86_32 with disable-optimizations.

2013-02-09 15:03:04 +01:00

libswresample

buildsys: only include log2_tab per library for shared builds

2013-03-04 12:25:02 +01:00

libswscale

Merge commit '7b89cd20d844cbe763ca34e63e99d110043cf241'

2013-03-12 15:44:15 +01:00

presets

presets: specify the codecs.

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

tests

Merge commit '3e2f200237af977b9253b0aff121eee27bcedb44'

2013-03-12 15:57:28 +01:00

tools

lavu: add escape API

2013-03-07 01:12:04 +01:00

.gitignore

tools: add seek_print.

2013-02-24 13:12:46 +01:00

arch.mak

Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'

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

Changelog

Merge commit 'd8b31be6caebd8d1321ecb754b6e7daaf81dc111'

2013-03-12 15:35:39 +01:00

cmdutils_common_opts.h

cmdutils: implement debug/fdebug log level update differently.

2012-12-20 02:38:18 +01:00

cmdutils.c

Merge commit '9d3009c6c4b9b6734f07df7c88f6a42ded6cdf38'

2013-03-12 18:10:35 +01:00

cmdutils.h

Merge commit '9d3009c6c4b9b6734f07df7c88f6a42ded6cdf38'

2013-03-12 18:10:35 +01:00

common.mak

Merge commit '4cc4b33f71d3982df404fceb4405d656c538bc74'

2013-02-24 15:24:38 +01:00

configure

atomic: Check for __sync_val_compare_and_swap instead of __sync_synchronize

2013-03-12 10:41:02 +01: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: port sub2video to AVFrame.

2013-03-10 13:45:15 +01:00

ffmpeg_opt.c

Merge commit '9d3009c6c4b9b6734f07df7c88f6a42ded6cdf38'

2013-03-12 18:10:35 +01:00

ffmpeg.c

Merge commit '354468fc12dcf93e7fb4af552e18906771913273'

2013-03-12 14:16:02 +01:00

ffmpeg.h

Merge commit '354468fc12dcf93e7fb4af552e18906771913273'

2013-03-12 14:16:02 +01:00

ffplay.c

Merge commit '354468fc12dcf93e7fb4af552e18906771913273'

2013-03-12 14:16:02 +01:00

ffprobe.c

ffprobe: use AVFrame accessor functions

2013-03-01 23:18:22 +01:00

ffserver.c

Merge commit 'ddcca4ba074aa537c3059c76d69eb4ad6316bfe9'

2013-03-12 14:27:54 +01:00

INSTALL

…

library.mak

build: fixes a "can't cd to..." issue when installing shared libraries.

2013-02-15 08:39:35 +01:00

LICENSE

lavfi: port MP stereo3d filter

2013-03-05 18:36:40 +00:00

MAINTAINERS

MAINTAINERS: update for 1.2

2013-03-08 14:45:26 +01:00

Makefile

build: Add proper infrastructure for adding and checking host CPPFLAGS

2013-02-23 20:23:45 +01:00

README

…

RELEASE

RELEASE: 1.1.git for master

2013-01-06 21:42:35 +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.1%

Assembly 7.9%

Makefile 1.3%

C++ 0.2%

Objective-C 0.2%

Other 0.1%