1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-07 11:13:41 +02:00
Go to file
Michael Niedermayer dee6d5f51c Merge commit '17a10d51b8351ce9a57fcb6537b6a3c6ec8ba5e9'
* commit '17a10d51b8351ce9a57fcb6537b6a3c6ec8ba5e9':
  hevc: set time_base when possible

See: f90281ca97
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-11 23:16:09 +01:00
compat Merge remote-tracking branch 'qatar/master' 2013-11-24 23:27:32 +01:00
doc doc: Fix adelay example. 2013-12-09 23:56:23 +01:00
libavcodec Merge commit '33452aede6acab78f726cd1924824585f00765cc' 2013-12-11 23:08:45 +01:00
libavdevice Merge commit 'd64341e498fa46c6cf4c23d408177d7489559654' 2013-12-09 20:52:14 +01:00
libavfilter avfilter/aeval: Fix use of uninitialized variable 2013-12-11 15:31:32 +01:00
libavformat avformat/utils: Check avcodec_open2() return code in av_find_stream_info() 2013-12-11 20:32:05 +01:00
libavresample avresample: Include libavutil/avutil.h in version.h 2013-12-06 22:13:20 +01:00
libavutil avutil/avstring: fix () position 2013-12-11 21:13:51 +01:00
libpostproc postproc: fix null pointer dereference with invalid option strings 2013-12-11 22:28:42 +01:00
libswresample Add Windows resource file support for shared libraries 2013-12-05 23:42:07 +01:00
libswscale swscale/utils: fill xyz tables only when they will be used 2013-12-07 02:04:31 +01:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests lavf/mux: Don't write "encoder" metadata tag when bitexact is requested 2013-12-06 19:33:41 +01:00
tools tools/probetest: Check av_realloc() return code 2013-12-11 22:29:22 +01:00
.gitignore Merge commit '3cd612d44789948f72b52944474e0870c5c60964' 2013-12-01 21:18:11 +01:00
arch.mak Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30' 2012-12-08 14:24:16 +01:00
Changelog Merge commit '7e244c68600f479270e979258e389ed5240885fb' 2013-12-09 21:33:51 +01:00
cmdutils_common_opts.h cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices 2013-12-09 21:21:36 +01:00
cmdutils_opencl.c cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices 2013-12-09 21:21:36 +01:00
cmdutils.c cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices 2013-12-09 21:21:36 +01:00
cmdutils.h cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices 2013-12-09 21:21:36 +01:00
common.mak common.mak: Less ugly version of the previous windres fix 2013-12-09 02:47:55 +01:00
configure Merge commit '3bb91a1b5c4a0c5ec9c4d3b6649b23285c3d7f26' 2013-12-11 22:52:28 +01:00
COPYING.GPLv2 Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1. 2009-06-05 09:51:31 +00:00
COPYING.GPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
COPYING.LGPLv2.1 cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
COPYING.LGPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
CREDITS CREDITS: redirect to Git log, remove current outdated content 2013-01-31 18:02:52 +01:00
ffmpeg_filter.c Merge remote-tracking branch 'qatar/master' 2013-11-24 05:21:19 +01:00
ffmpeg_opt.c Merge remote-tracking branch 'qatar/master' 2013-12-04 04:30:46 +01:00
ffmpeg_vdpau.c Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea' 2013-11-23 14:46:48 +01:00
ffmpeg.c ffmpeg: ensure that -fix_sub_duration doesnt create subtitles with zero duration 2013-11-28 21:30:03 +01:00
ffmpeg.h Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea' 2013-11-23 14:46:48 +01:00
ffplay.c ffplay: set default window size before starting audio 2013-12-06 19:57:45 +01:00
ffprobe.c ffprobe: free shared writer context on exit 2013-12-03 21:27:14 +01:00
ffserver.c ffserver: print error code description in case of write_header() failure 2013-11-30 14:35:33 +01:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
library.mak Add Windows resource file support for shared libraries 2013-12-05 23:42:07 +01:00
LICENSE libavfilter/vf_noise: relicense to LGPL 2013-10-27 20:29:07 +00:00
MAINTAINERS MAINTAINERS: Add 1.2 back to the maintained releases 2013-11-12 14:33:54 +01:00
Makefile cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices 2013-12-09 21:21:36 +01:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE RELEASE: update to 2.1.git 2013-11-29 16:41:42 +01:00
version.sh version.sh: add preprocessing guards 2013-11-30 21:42:03 +01:00

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.