1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Go to file
Michael Niedermayer e00281b6f5 Merge commit '2d18aaa14bc2233b0647d2c5abb72e0bc828c2a8'
* commit '2d18aaa14bc2233b0647d2c5abb72e0bc828c2a8':
  hevc: refactor Profile Tier Level
  hevc: don't check for errors in PTL code

Conflicts:
	libavcodec/hevc_ps.c

See: 36658c978f
See: dddc9b7a8e
See: ecb21d2437
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-21 00:44:44 +01:00
compat
doc Merge commit '2a41826bea3833895dc06939831b7f35ca1f597e' 2013-12-21 00:24:43 +01:00
libavcodec Merge commit '2d18aaa14bc2233b0647d2c5abb72e0bc828c2a8' 2013-12-21 00:44:44 +01:00
libavdevice
libavfilter lavfi/hue: show first decimal value of saturation 2013-12-20 19:25:42 +01:00
libavformat Merge commit 'f412b2c9f3a7add0ab8021262ec4bad249347e30' 2013-12-21 00:14:11 +01:00
libavresample
libavutil Merge remote-tracking branch 'qatar/master' 2013-12-20 13:16:56 +01:00
libpostproc
libswresample
libswscale swscale/x86/rgb2rgb_template: try to fix build failure with avx disabled 2013-12-16 03:38:13 +01:00
presets
tests Merge remote-tracking branch 'qatar/master' 2013-12-19 03:18:07 +01:00
tools
.gitignore
arch.mak
Changelog png: add a standalone parser 2013-12-17 09:34:08 +01:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c
cmdutils.h
common.mak
configure Merge commit '8558595a59913a4667f57d5a4658b1340f1a4354' 2013-12-20 13:00:21 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg_vdpau.c
ffmpeg.c remuxing .opus files to .webm codec->delay must be copied too 2013-12-19 23:43:14 +01:00
ffmpeg.h
ffplay.c
ffprobe.c ffprobe: drop dependancy on sizeof(AVFrame) 2013-12-17 17:11:00 +01:00
ffserver.c ffserver: extend report_config_error() facilities, and use it for warnings 2013-12-16 19:19:04 +01: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.