wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
No description
57588 commits 40 branches 405 tags 230 MiB
Find a file
Michael Niedermayer 4d373ee8e4 Merge commit '97168b204a' 
* commit '97168b204a':
  eatgv: use the AVFrame API properly.
  libxavs: use the AVFrame API properly.
  nuv: use the AVFrame API properly.
  flashsvenc: use the AVFrame API properly.

Conflicts:
	libavcodec/eatgv.c
	libavcodec/nuv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a0c0629dd9)

Conflicts:

	libavcodec/eatgv.c
Author of the merged code: Anton Khirnov
2014-01-07 03:32:43 +01:00
compat Merge commit 'ef51692a49' 2013-08-28 12:46:12 +02:00
doc avcodec/libopusenc: change default frame duration to 20 ms 2014-01-07 03:05:30 +01:00
libavcodec Merge commit '97168b204a' 2014-01-07 03:32:43 +01:00
libavdevice lavd/lavfi: support unknown channel layouts. 2013-11-28 01:04:54 +01:00
libavfilter do O(1) instead of O(n) atomic operations in register functions 2014-01-07 03:05:30 +01:00
libavformat do O(1) instead of O(n) atomic operations in register functions 2014-01-07 03:05:30 +01:00
libavresample Merge commit '206895708e' 2013-10-14 15:54:23 +02:00
libavutil avutil/log: skip IO calls on empty strings 2014-01-07 03:05:30 +01:00
libpostproc postprocess_template: put rsp on the clobber list to prevent gcc from using it in "q" 2013-06-16 18:21:39 +02:00
libswresample lswr: fix assert failure on unknown layouts. 2013-11-28 01:05:20 +01:00
libswscale swscale/utils: fill xyz tables only when they will be used 2014-01-07 03:05:30 +01:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests wtvenc: populate VIDEOINFOHEADER2 2013-12-24 07:39:31 +01:00
tools Merge remote-tracking branch 'qatar/master' 2013-10-05 11:35:39 +02:00
.gitignore tools: add benchmark for crypto functions. 2013-09-04 16:36:11 +02:00
arch.mak Merge commit 'b326755989' 2012-12-08 14:24:16 +01:00
Changelog Changelog: add 2.1 2013-10-28 00:39:34 +01:00
cmdutils.c cmdutils: add -colors option 2013-10-27 09:18:45 +01:00
cmdutils.h cmdutils: add -colors option 2013-10-27 09:18:45 +01:00
cmdutils_common_opts.h cmdutils: add -colors option 2013-10-27 09:18:45 +01:00
common.mak Merge commit '47b6cfc2a0' 2013-10-04 11:49:01 +02:00
configure configure: support raising major version in soname 2014-01-07 03:05:30 +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.c ffmpeg: set VCFR when copying timestamps 2013-11-29 11:31:05 +01:00
ffmpeg.h ffmpeg: Do not fill gap before the first decodable frame on single stream input files unless the user explicitly requests it. 2013-11-17 19:11:07 +01:00
ffmpeg_filter.c ffmpeg_filter: Fix non jpeg yuv in jpeg support 2013-10-27 17:41:06 +01:00
ffmpeg_opt.c ffmpeg: Do not fill gap before the first decodable frame on single stream input files unless the user explicitly requests it. 2013-11-17 19:11:07 +01:00
ffplay.c ffplay: add support for libswresample options 2013-10-26 12:23:54 +02:00
ffprobe.c ffprobe: fix consistency checks in parse_read_intervals() 2013-10-21 13:33:06 +02:00
ffserver.c ffserver: strip odd chars from html error messages before sending them back 2013-10-09 00:30:46 +02:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
library.mak build: remove pointless condition 2013-10-24 10:51:03 +01:00
LICENSE libavfilter/vf_noise: relicense to LGPL 2013-10-27 20:29:07 +00:00
MAINTAINERS MAINTAINERS: update which releases i maintain 2013-10-28 00:40:15 +01:00
Makefile Merge commit '90f9a5830b' 2013-05-24 13:01:41 +02:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE update for 2.1.1 2013-11-20 03:12:11 +01:00
VERSION update for 2.1.1 2013-11-20 03:12:11 +01:00
version.sh version.sh: handle shallow clones and snapshots. 2011-07-22 10:43:59 +02: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.