generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
63,161 Commits 24 Branches 241 Tags 173 MiB
C 92.1%
Assembly 6%
Makefile 1.2%
C++ 0.3%
Objective-C 0.2%
Other 0.1%
098a699867
Go to file
Michael Niedermayer 098a699867 Merge commit '3b2fbe67bd63b00331db2a9b213f6d420418a312' 
* commit '3b2fbe67bd63b00331db2a9b213f6d420418a312':
  lavc: properly handle subtitle_header in avcodec_copy_context()

Conflicts:
	libavcodec/options.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-15 19:39:06 +02:00
compat Merge remote-tracking branch 'qatar/master' 2014-03-10 12:05:02 +01:00
doc Merge commit '0c1959b056f6ccaa2eee2c824352ba93c8e36d52' 2014-05-15 19:16:57 +02:00
libavcodec Merge commit '3b2fbe67bd63b00331db2a9b213f6d420418a312' 2014-05-15 19:39:06 +02:00
libavdevice Merge commit '449511740f06a4675b0066730fa45cdb764ffafc' 2014-05-13 22:40:32 +02:00
libavfilter avfilter/vsrc_mandelbrot: use av_malloc_array() 2014-05-15 01:54:36 +02:00
libavformat Merge commit 'c9281a01b78cc3f09e36300a0ca3f5824d1c74cf' 2014-05-15 19:24:19 +02:00
libavresample Merge commit '449511740f06a4675b0066730fa45cdb764ffafc' 2014-05-13 22:40:32 +02:00
libavutil avutil/dict: delay addition of const from e12a73246d until next major ABI bump 2014-05-14 15:44:01 +02:00
libpostproc Fix libpostproc compilation with !HAVE_6REGS. 2014-04-24 17:50:02 +02:00
libswresample swresample: swr_close() 2014-05-15 18:27:23 +02:00
libswscale swscale/utils: Add check that ensures that the hardcoded struct offsets are valid 2014-05-14 01:32:11 +02:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests Merge commit '0c1959b056f6ccaa2eee2c824352ba93c8e36d52' 2014-05-15 19:16:57 +02:00
tools tools/ismindex: use av_mallocz_array() 2014-05-05 18:47:24 +02:00
.gitignore gitignore: add tools/uncoded_frame 2014-05-06 14:14:32 +02:00
arch.mak Merge commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14' 2014-04-07 02:15:18 +02:00
Changelog Merge commit 'b70d7a4ac72d23f3448f3b08b770fdf5f57de222' 2014-05-15 18:20:17 +02: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 cmdutils: omit deprecated codec ids in help output 2014-04-29 22:13:35 +02:00
cmdutils.h cmdutils: include config.h, fix "is not defined" warning due to CONFIG_OPENCL 2014-05-07 06:14:57 +02:00
common.mak Merge commit '7e90133f6420b1c53652f972b9561600822881ee' 2014-05-14 14:02:19 +02:00
configure avcodec/opusdec: switch to swresample 2014-05-15 18:28:45 +02: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_dxva2.c Merge commit 'a7c5fddac8137654cb503295c4dfb6492df43643' 2014-04-30 00:46:38 +02:00
ffmpeg_filter.c Merge commit '9580818c5d934bde65a95efd2cee61c174721092' 2014-05-05 15:51:55 +02:00
ffmpeg_opt.c Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7' 2014-05-12 02:44:28 +02:00
ffmpeg_vda.c Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7' 2014-05-12 02:44:28 +02:00
ffmpeg_vdpau.c Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea' 2013-11-23 14:46:48 +01:00
ffmpeg.c ffmpeg: use av_fifo_freep 2014-05-07 23:39:47 +02:00
ffmpeg.h Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7' 2014-05-12 02:44:28 +02:00
ffplay.c avformat: add av_format_inject_global_side_data(), and disable it by default 2014-04-15 02:37:40 +02:00
ffprobe.c ffprobe: use the codec descriptor if no decoder was found. 2014-04-29 13:25:59 +02:00
ffserver.c ffserver: don't leak poll_table if poll fails 2014-05-10 18:16:19 -04:00
INSTALL
library.mak Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90' 2014-02-17 02:22:01 +01:00
LICENSE Add libx265 encoder 2014-02-12 13:13:17 +00:00
MAINTAINERS MAINTANERS: update snow/ffv1/nut entries as these are no longer in a single file 2014-05-04 18:57:15 +02:00
Makefile Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7' 2014-05-12 02:44:28 +02:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE Prepare for 11_alpha1 Release 2014-03-13 08:24:11 -04:00
version.sh version.sh: add preprocessing guards 2013-11-30 21:42:03 +01:00

README 

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.