1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Go to file
Michael Niedermayer 3cf1503beb Merge commit 'a6a2282c25abe43e352010a7c3fbc92994c0bc1c'
* commit 'a6a2282c25abe43e352010a7c3fbc92994c0bc1c':
  rv30: fix extradata size check.

Conflicts:
	libavcodec/rv30.c

See: 09c5f990bc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-04 00:39:51 +01:00
compat compat: provide va_copy for old gcc versions. 2013-12-30 12:38:03 +01:00
doc doc/faq: remove "-profile option fails when encoding H.264 video with AAC audio" entry 2014-01-03 17:05:44 +01:00
libavcodec Merge commit 'a6a2282c25abe43e352010a7c3fbc92994c0bc1c' 2014-01-04 00:39:51 +01:00
libavdevice lavd/xv: report if no adaptor present. 2013-12-29 19:51:42 +01:00
libavfilter af_aresample: remove only use of array compound literals with non-const initializers in FFmpeg. 2013-12-30 12:38:04 +01:00
libavformat avformat/utils: fix order of buffers in timestamp update code 2014-01-03 23:27:28 +01:00
libavresample Merge commit 'b83d1ee3b41cfe8357836e2582104db2f3364cb0' 2013-12-27 12:01:23 +01:00
libavutil avutil/mathematics: fix 2 typos in the doxy 2014-01-03 18:01:49 +01:00
libpostproc postproc: fix null pointer dereference with invalid option strings 2013-12-11 22:28:42 +01:00
libswresample Avoid using empty macro arguments. 2013-12-31 12:19:59 +01:00
libswscale swscale/arm: fix build error with --enable-shared 2013-12-28 14:28:25 +01:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests fate: Add OggVP8 demux test 2014-01-02 02:31:24 +01:00
tools tools/zmqsend: rename ctx to zmq_ctx 2013-12-23 18:44:52 +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 oggdec: add support for VP8 demuxing 2013-12-30 04:05:27 +01:00
cmdutils_common_opts.h Allow hiding the banner. 2013-12-29 22:57:20 +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 Allow hiding the banner. 2013-12-29 22:57:20 +01:00
cmdutils.h Allow hiding the banner. 2013-12-29 22:57:20 +01:00
common.mak common.mak: Less ugly version of the previous windres fix 2013-12-09 02:47:55 +01:00
configure configure: bump year number 2013 -> 2014 2014-01-01 13:04:07 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1 cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
COPYING.LGPLv3
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 ffmpeg: do not fail when options are routed to libavformat and libavcodec and only one can be used 2014-01-03 02:24:27 +01:00
ffmpeg_vdpau.c Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea' 2013-11-23 14:46:48 +01:00
ffmpeg.c ffmpeg: use timestamp from before and after the decoder to detect backward moving dts for discontinuity detection 2013-12-22 19:48:00 +01:00
ffmpeg.h Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea' 2013-11-23 14:46:48 +01:00
ffplay.c ffplay: do not wait for the picture allocation to finish on exit 2013-12-29 13:19:19 +01:00
ffprobe.c ffprobe: check av_frame_alloc() failure. 2013-12-30 10:58:01 +01:00
ffserver.c ffserver: extend report_config_error() facilities, and use it for warnings 2013-12-16 19:19:04 +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 myself for spdif* and hls.c 2014-01-03 15:05:48 +02: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.