1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-03 05:10:03 +02:00
Go to file
Michael Niedermayer 6659364d3a Merge commit '797f2a791397210ec1b591b326658805c5dbf104'
* commit '797f2a791397210ec1b591b326658805c5dbf104':
  hdsenc: Check the init_file() return code
  hdsenc: Fix an off by one error in an array size check
  hdsenc: Avoid integer overflow

Conflicts:
	libavformat/hdsenc.c

See: 572965c9a6
See: 3dbf9afe85
See: 6722e564a8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-14 22:17:17 +01:00
compat
doc doc/bitstream_filters: remove mp3_header_decompress filter 2013-12-14 21:47:51 +01:00
libavcodec vp9/x86: idct_add_16x16_ssse3. 2013-12-14 12:13:26 -05:00
libavdevice Merge commit 'd64341e498fa46c6cf4c23d408177d7489559654' 2013-12-09 20:52:14 +01:00
libavfilter avfilter/vf_pullup: fix memleak on error 2013-12-13 15:14:03 +01:00
libavformat Merge commit '797f2a791397210ec1b591b326658805c5dbf104' 2013-12-14 22:17:17 +01:00
libavresample
libavutil Merge remote-tracking branch 'qatar/master' 2013-12-14 13:09:30 +01:00
libpostproc postproc: fix null pointer dereference with invalid option strings 2013-12-11 22:28:42 +01:00
libswresample
libswscale Merge remote-tracking branch 'qatar/master' 2013-12-14 13:09:30 +01:00
presets
tests
tools tools/probetest: Check av_realloc() return code 2013-12-11 22:29:22 +01:00
.gitignore
arch.mak
Changelog Changelog: correct typo 2013-12-14 21:47:17 +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 '5db4e88ecd32485341f6150c00f5ee5bfa74f62d' 2013-12-14 22:14:01 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg_vdpau.c
ffmpeg.c Merge commit '674fa49110a661694188a958be13d529b7c8c5dd' 2013-12-11 23:36:10 +01:00
ffmpeg.h
ffplay.c Merge commit '84f131921ffb43d8070d5680e91f6a24d66ccac4' 2013-12-11 23:49:44 +01:00
ffprobe.c ffprobe: only show tags when explicitly requested 2013-12-14 13:22:04 +01:00
ffserver.c ffserver: improve error feedback in case of av_write_frame() error 2013-12-13 09:42:15 +01:00
INSTALL
library.mak
LICENSE
MAINTAINERS MAINTAINERS: remove ffserver maintainership status notice 2013-12-13 09:42:15 +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
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.