1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Go to file
Michael Niedermayer 89c5de6652 Merge commit '91be8df20b57a18307e90f1c4886a35ea7b28880'
* commit '91be8df20b57a18307e90f1c4886a35ea7b28880':
  vp9: add fate sample for parallelmode.

Conflicts:
	tests/fate/vpx.mak
	tests/ref/fate/vp9-parallelmode-akiyo

See: 1d6bb21348
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-13 00:33:31 +01:00
compat
doc Add libx265 encoder 2014-02-12 13:13:17 +00:00
libavcodec Merge commit '50ea93158d4c480f64069e8bd1da388486dcf4ba' 2014-02-13 00:15:28 +01:00
libavdevice lavf/lavd: version bump and APIchanges for uncoded frames. 2014-02-11 10:34:32 +01:00
libavfilter Merge commit '4a7d3837b4dd17fff270b55166597c093204e542' 2014-02-12 14:49:29 +01:00
libavformat avformat/asfdec: pass on error code from avio_seek() 2014-02-12 17:10:26 +01:00
libavresample Merge commit '76a75c523cd3c63560185394a0a5cd7249db962a' 2014-02-08 18:38:17 +01:00
libavutil Merge commit '25a1ba814ad80056247fd357ec4c6911324a3f66' 2014-02-12 14:41:24 +01:00
libpostproc
libswresample swresample: Add arm&x86 clobber tests 2014-01-18 18:38:57 +01:00
libswscale Merge remote-tracking branch 'qatar/master' 2014-01-21 22:20:26 +01:00
presets
tests Merge commit '91be8df20b57a18307e90f1c4886a35ea7b28880' 2014-02-13 00:33:31 +01:00
tools tools: add uncoded_frame test program. 2014-02-11 10:31:29 +01:00
.gitignore examples: add avio_reading.c example 2014-02-02 11:58:23 +01:00
arch.mak
Changelog Add libx265 encoder 2014-02-12 13:13:17 +00:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c cmdutils: update copyright year to 2014. 2014-01-05 22:39:35 +02:00
cmdutils.h
common.mak
configure Add libx265 encoder 2014-02-12 13:13:17 +00:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg_vdpau.c
ffmpeg.c ffmpeg: fix vstats 2014-02-10 20:31:06 +01:00
ffmpeg.h ffmpeg: change ost->finished to an enum 2014-01-17 23:57:02 +01:00
ffplay.c Merge commit 'b36bc81ccaa2fc85dc4bae7dc546c71e8833573d' 2014-02-10 13:26:31 +01:00
ffprobe.c
ffserver.c ffserver: drop unneeded delay1 var 2014-02-08 00:30:29 -03:00
INSTALL
library.mak
LICENSE Add libx265 encoder 2014-02-12 13:13:17 +00:00
MAINTAINERS MAINTAINERS: add myself as opengl_enc.c maintainer 2014-01-28 15:30:49 +01:00
Makefile tools: add uncoded_frame test program. 2014-02-11 10:31:29 +01:00
README
RELEASE Prepare for 10_alpha2 Release 2014-01-18 10:27:27 -05:00
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.