1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Go to file
Michael Niedermayer 1e5656bf8a Merge commit 'b5f851ed7e59f88b4130a420033d9fe191ec9e2f'
* commit 'b5f851ed7e59f88b4130a420033d9fe191ec9e2f':
  FATE: force FLAC in the lavf ogg test

Conflicts:
	tests/lavf-regression.sh

See: 28caf13ac3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-10 12:39:55 +01:00
compat
doc Merge commit 'd711d839ca6714a5ef5b53ee51bc7632e62cf203' 2014-02-10 12:17:35 +01:00
libavcodec Merge remote-tracking branch 'qatar/master' 2014-02-10 03:54:54 +01:00
libavdevice lavd: add decklink output device 2014-02-09 17:15:19 +01:00
libavfilter Fix a few heigth/height typo. 2014-02-07 09:33:56 +01:00
libavformat pcmdec: replace a reachable assert with an error check 2014-02-10 07:41:21 +01:00
libavresample Merge commit '76a75c523cd3c63560185394a0a5cd7249db962a' 2014-02-08 18:38:17 +01:00
libavutil Merge commit 'e3fec3f095ab5ea08ee662942d98526aaf5e3635' 2014-02-08 00:49:28 +01:00
libpostproc
libswresample
libswscale
presets
tests Merge commit 'b5f851ed7e59f88b4130a420033d9fe191ec9e2f' 2014-02-10 12:39:55 +01:00
tools
.gitignore examples: add avio_reading.c example 2014-02-02 11:58:23 +01:00
arch.mak
Changelog Merge commit 'e95018b694c0774477abec5bbf86ecc7946a9a28' 2014-02-10 03:42:06 +01:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c
cmdutils.h
common.mak
configure lavd: add decklink output device 2014-02-09 17:15:19 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg_vdpau.c
ffmpeg.c ffmpeg: tweak debug_ts logging and add more of it 2014-02-02 13:11:52 +01:00
ffmpeg.h
ffplay.c ffplay: flush subtitle codecs as well with null packets 2014-02-05 00:00:23 +01:00
ffprobe.c
ffserver.c ffserver: drop unneeded delay1 var 2014-02-08 00:30:29 -03:00
INSTALL
library.mak
LICENSE
MAINTAINERS MAINTAINERS: add myself as opengl_enc.c maintainer 2014-01-28 15:30:49 +01:00
Makefile
README
RELEASE
version.sh

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.