FFmpeg

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

Go to file

Michael Niedermayer 16310e36d9 Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Avoid a null pointer dereference in avcodec_decode_video2().
  Set block_align when reading QDM2 in mov.
  Fix muxing QDM2 mono into caf.

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

2013-06-28 10:14:16 +02:00

compat

os2threads: move from lavc to compat/

2013-05-28 12:49:20 +02:00

doc

examples/muxing: rename audio/video_pts to audio/video_time

2013-06-26 23:38:42 +02:00

libavcodec

Merge remote-tracking branch 'cehoyos/master'

2013-06-28 10:14:16 +02:00

libavdevice

avdevice/x11grab: allocate just one Cursor

2013-06-21 12:00:11 +02:00

libavfilter

avfilter/vf_mp: preserve pixel format when possible

2013-06-28 03:32:00 +02:00

libavformat

Set block_align when reading QDM2 in mov.

2013-06-28 09:04:16 +02:00

libavresample

Merge commit '006ec64877fb638de4b15ae5fd969e22bd0f60ca'

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

libavutil

avutil/ripemd: adjust loop condition to silence CID1035716

2013-06-22 14:52:29 +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

swresample/x86/audio_convert: add emms to CONV

2013-06-18 02:26:36 +02:00

libswscale

swscale: Fix PAL8 input with alpha

2013-06-26 15:14:00 +02:00

presets

presets: specify the codecs.

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

tests

fate: Add Canopus Lossless YUY2 test

2013-06-25 11:26:23 +02:00

tools

tools/qt-faststart: Fix unintended sign extension of current_offset

2013-06-02 23:10:44 +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

lavfi: add spp filter.

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

cmdutils_common_opts.h

cmdutils_common_opts: fix indention of #if

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

cmdutils.c

cmdutils: dont change the log level for -report

2013-06-24 02:59:05 +02:00

cmdutils.h

Merge commit 'e19e8aeeaaff3d4bc8f6065764c93f0298782ac6'

2013-04-12 15:56:20 +02:00

common.mak

Merge commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975'

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

configure

Require pthreads for compilation with OpenCL support.

2013-06-26 09:46:09 +02: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

CREDITS: redirect to Git log, remove current outdated content

2013-01-31 18:02:52 +01:00

ffmpeg_filter.c

Merge commit '72fbc9685c08baae7ab9996642707eaab873b6f1'

2013-05-10 22:51:04 +02:00

ffmpeg_opt.c

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

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

ffmpeg.c

Merge commit '42cc6cefd315c1556e2a52f7ebe2f766ec82b790'

2013-06-23 12:56:55 +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: simplify and fix flushing out old subtitles on seeking

2013-06-26 22:30:16 +02:00

ffprobe.c

ffprobe: always exit 1 in case of errors

2013-06-27 00:20:36 +02:00

ffserver.c

ffserver: fix null pointer dereference

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

INSTALL

Merge remote branch 'qatar/master'

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

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

Add maintainer for WebVTT demuxer and muxer

2013-06-18 18:02:30 +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

RELEASE: 1.1.git for master

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

Languages

C 90.1%

Assembly 7.9%

Makefile 1.3%

C++ 0.2%

Objective-C 0.2%

Other 0.1%