generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
50,591 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%
2653e12520
Go to file
Michael Niedermayer 2653e12520 Merge commit '1afddbe59e96af75f1c07605afc95615569f388f' 
* commit '1afddbe59e96af75f1c07605afc95615569f388f':
  avpacket: use AVBuffer to allow refcounting the packets.

Conflicts:
	libavcodec/avpacket.c
	libavcodec/utils.c
	libavdevice/v4l2.c
	libavformat/avidec.c
	libavformat/flacdec.c
	libavformat/id3v2.c
	libavformat/matroskaenc.c
	libavformat/mux.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-08 19:12:03 +01:00
compat Use the avstring.h locale-independent character type functions 2013-03-07 15:16:36 +02:00
doc Merge commit 'efa7f4202088c70caba11d7834641bc6eaf41830' 2013-03-08 14:57:41 +01:00
libavcodec Merge commit '1afddbe59e96af75f1c07605afc95615569f388f' 2013-03-08 19:12:03 +01:00
libavdevice Merge commit '1afddbe59e96af75f1c07605afc95615569f388f' 2013-03-08 19:12:03 +01:00
libavfilter Merge commit 'efa7f4202088c70caba11d7834641bc6eaf41830' 2013-03-08 14:57:41 +01:00
libavformat Merge commit '1afddbe59e96af75f1c07605afc95615569f388f' 2013-03-08 19:12:03 +01:00
libavresample Merge commit '45235ac488363e3360bf2f2275102d1ec66eba0f' 2013-02-24 17:45:06 +01:00
libavutil Merge commit '1cec0624d0e6f48590283a57169b58b9fe8449d3' 2013-03-08 16:06:20 +01:00
libpostproc Fix libpostproc compilation on x86_32 with disable-optimizations. 2013-02-09 15:03:04 +01:00
libswresample buildsys: only include log2_tab per library for shared builds 2013-03-04 12:25:02 +01:00
libswscale swscale: Add support for unscaled 8-bit Packed RGB -> Planar RGB 2013-02-27 09:51:43 -05:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests Merge commit '65f1d45dcc71186ede72fff950996099d23359bd' 2013-03-08 15:48:27 +01:00
tools lavu: add escape API 2013-03-07 01:12:04 +01:00
.gitignore tools: add seek_print. 2013-02-24 13:12:46 +01:00
arch.mak Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30' 2012-12-08 14:24:16 +01:00
Changelog lavfi: port MP stereo3d filter 2013-03-05 18:36:40 +00:00
cmdutils_common_opts.h cmdutils: implement debug/fdebug log level update differently. 2012-12-20 02:38:18 +01:00
cmdutils.c Use the avstring.h locale-independent character type functions 2013-03-07 15:16:36 +02:00
cmdutils.h ffmpeg: use a AVDictionary instead of the context to move swr parameters around 2013-02-24 20:31:56 +01:00
common.mak Merge commit '4cc4b33f71d3982df404fceb4405d656c538bc74' 2013-02-24 15:24:38 +01:00
configure Merge commit '65f1d45dcc71186ede72fff950996099d23359bd' 2013-03-08 15:48:27 +01:00
COPYING.GPLv2
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-03-07 00:28:15 +01:00
ffmpeg_opt.c ffmpeg_opt: Ask for overwrite in single image2 files too 2013-03-03 22:09:01 +01:00
ffmpeg.c Merge commit '1afddbe59e96af75f1c07605afc95615569f388f' 2013-03-08 19:12:03 +01:00
ffmpeg.h ffmpeg_opt: add -to option to specify stop time 2013-02-27 02:17:42 +01:00
ffplay.c ffplay: use AVFrame accessor functions 2013-03-01 23:22:08 +01:00
ffprobe.c ffprobe: use AVFrame accessor functions 2013-03-01 23:18:22 +01:00
ffserver.c Remove incorrect use of ctype.h functions. 2013-03-03 21:44:10 +01:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
library.mak build: fixes a "can't cd to..." issue when installing shared libraries. 2013-02-15 08:39:35 +01:00
LICENSE lavfi: port MP stereo3d filter 2013-03-05 18:36:40 +00:00
MAINTAINERS MAINTAINERS: update for 1.2 2013-03-08 14:45:26 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-12-11 08:24:45 +01:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE RELEASE: 1.1.git for master 2013-01-06 21:42:35 +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.