1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-03 05:10:03 +02:00
Go to file
Michael Niedermayer d93cf093f8 Merge commit '632ad2248e2e5d8cd4b51e6c87c943a38c3da425'
* commit '632ad2248e2e5d8cd4b51e6c87c943a38c3da425':
  lavc: Add an internal wrapper around get_format()

Conflicts:
	libavcodec/h264_slice.c
	libavcodec/mpeg12dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-11 21:48:32 +02:00
compat
doc Document smoothstreaming muxer 2014-05-10 00:06:32 +02:00
libavcodec Merge commit '632ad2248e2e5d8cd4b51e6c87c943a38c3da425' 2014-05-11 21:48:32 +02:00
libavdevice
libavfilter libmpcodecs/vf_uspp: check avcodec_open() return code 2014-05-11 02:13:28 +02:00
libavformat avformat/mpegtsenc: fix minor typo in omit_video_pes_length description 2014-05-11 03:20:00 +02:00
libavresample
libavutil opencl: Make init_mtx static with volatile lock 2014-05-10 15:07:33 +02:00
libpostproc
libswresample
libswscale
presets
tests
tools
.gitignore
arch.mak
Changelog
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c
cmdutils.h
common.mak
configure configure: Fix floating point conformance ith icl. 2014-05-11 13:57:00 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_dxva2.c
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg_vdpau.c
ffmpeg.c
ffmpeg.h
ffplay.c
ffprobe.c
ffserver.c ffserver: don't leak poll_table if poll fails 2014-05-10 18:16:19 -04:00
INSTALL
library.mak
LICENSE
MAINTAINERS
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.