1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Go to file
Michael Niedermayer cbf190f7ae Merge commit '80173c71bab3b8817c148837bdc920557018f428'
* commit '80173c71bab3b8817c148837bdc920557018f428':
  bfin: hpeldsp: K&R formatting cosmetics

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-14 01:56:45 +01:00
compat Merge remote-tracking branch 'qatar/master' 2014-03-10 12:05:02 +01:00
doc Merge commit 'b4dd424d96f09f9bafb88e47f37df65dc4529143' 2014-03-13 22:35:47 +01:00
libavcodec Merge commit '80173c71bab3b8817c148837bdc920557018f428' 2014-03-14 01:56:45 +01:00
libavdevice Merge remote-tracking branch 'cigaes/master' 2014-03-08 15:00:36 +01:00
libavfilter lavfi/af_atempo: clear references before returning error. 2014-03-08 12:31:00 +01:00
libavformat Merge remote-tracking branch 'qatar/master' 2014-03-13 14:21:27 +01:00
libavresample Merge remote-tracking branch 'qatar/master' 2014-02-22 21:12:02 +01:00
libavutil Merge commit 'da785231ea0b82b5c2526babbb2871c935b21a87' 2014-03-14 01:56:25 +01:00
libpostproc
libswresample swr: check that the context for swr_convert() has been initialized 2014-02-24 08:23:42 +01:00
libswscale Merge commit 'da785231ea0b82b5c2526babbb2871c935b21a87' 2014-03-14 01:56:25 +01:00
presets
tests Add fieldmatch test 2014-03-10 02:59:01 +01:00
tools tools/build_libstagefright: switch git urls to https 2014-03-12 23:07:00 +01:00
.gitignore Merge commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a' 2014-02-25 20:26:00 +01:00
arch.mak Merge commit 'b4dd424d96f09f9bafb88e47f37df65dc4529143' 2014-03-13 22:35:47 +01:00
Changelog lavf: add subfile protocol. 2014-03-08 12:36:57 +01:00
cmdutils_common_opts.h Allow hiding the banner. 2013-12-29 22:57:20 +01:00
cmdutils_opencl.c
cmdutils.c avconv: Match stream id 2014-03-13 11:59:34 +01:00
cmdutils.h Allow hiding the banner. 2013-12-29 22:57:20 +01:00
common.mak Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90' 2014-02-17 02:22:01 +01:00
configure Merge commit 'b4dd424d96f09f9bafb88e47f37df65dc4529143' 2014-03-13 22:35:47 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c ffmpeg_opt: get_preset_file_2(): fix avio_open2() return code check 2014-02-25 00:05:37 +01:00
ffmpeg_vdpau.c
ffmpeg.c ffmpeg: dont try to run the subtitle encoder on non subtitle streams 2014-03-03 21:06:24 +01:00
ffmpeg.h Merge commit '67f2a688143b644f99360565a9f36c61a5f052e9' 2014-02-24 21:08:19 +01:00
ffplay.c ffplay: display information on stream cycling 2014-03-12 00:32:38 +01:00
ffprobe.c ffprobe: check av_frame_alloc() failure. 2013-12-30 10:58:01 +01:00
ffserver.c ffserver: merge RTSP's teardown & pause routines 2014-02-14 14:31:42 -03:00
INSTALL
library.mak Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90' 2014-02-17 02:22:01 +01:00
LICENSE Add libx265 encoder 2014-02-12 13:12:22 +00:00
MAINTAINERS update for 2.2 2014-03-01 03:34:59 +01:00
Makefile Merge commit 'b4dd424d96f09f9bafb88e47f37df65dc4529143' 2014-03-13 22:35:47 +01:00
README
RELEASE Prepare for 11_alpha1 Release 2014-03-13 08:24:11 -04: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.