1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Go to file
Michael Niedermayer 1db87da351 Merge commit '9cd4bc41760f8ad879e248920eacbe1e7757152c'
* commit '9cd4bc41760f8ad879e248920eacbe1e7757152c':
  ac3dec: set AV_FRAME_DATA_DOWNMIX_INFO side data.

Conflicts:
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-16 02:18:58 +01:00
compat
doc Merge commit 'c98f3169bfb578c1a4e407b44524f0bfa3b4dc0c' 2014-02-16 02:05:29 +01:00
libavcodec Merge commit '9cd4bc41760f8ad879e248920eacbe1e7757152c' 2014-02-16 02:18:58 +01:00
libavdevice lavd/avdevice: add param to create window buffer message 2014-02-14 05:13:33 +01:00
libavfilter avfilter/af_compand: do not leak frames on error 2014-02-15 11:38:32 +00:00
libavformat avformat/utils: skip the MPEG-2 style dts/pts code for HEVC 2014-02-14 20:51:10 +01:00
libavresample
libavutil Merge commit 'c98f3169bfb578c1a4e407b44524f0bfa3b4dc0c' 2014-02-16 02:05:29 +01:00
libpostproc
libswresample
libswscale
presets
tests utvideoenc: Enable support for multiple slices and use them 2014-02-14 21:38:00 +01:00
tools tools/uncoded_frame: fix double free 2014-02-13 01:29:01 +01:00
.gitignore
arch.mak
Changelog Add libx265 encoder 2014-02-12 13:13:17 +00:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c
cmdutils.h
common.mak
configure Merge commit 'd261719319a505e1716e8b52fc955bef0503ff96' 2014-02-14 02:45:45 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg_vdpau.c
ffmpeg.c
ffmpeg.h
ffplay.c
ffprobe.c
ffserver.c ffserver: merge RTSP's teardown & pause routines 2014-02-14 14:31:42 -03:00
INSTALL
library.mak Merge commit '3a26ccbf0d9f806d067e76a3f484170abecb36b3' 2014-02-14 15:23:29 +01:00
LICENSE Add libx265 encoder 2014-02-12 13:13:17 +00:00
MAINTAINERS MAINTAINERS: add myself as ffserver maintainer 2014-02-14 14:31:42 -03:00
Makefile tools: add uncoded_frame test program. 2014-02-11 10:31:29 +01:00
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.