wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
No description
44946 commits 40 branches 405 tags 230 MiB
Find a file
Michael Niedermayer 31ab1575e5 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avcodec: Convert some commented-out printf/av_log instances to av_dlog
  avcodec: Drop silly and/or broken printf debug output
  avcodec: Drop some silly commented-out av_log() invocations
  avformat: Convert some commented-out printf/av_log instances to av_dlog
  avformat: Remove non-compiling and/or silly commented-out printf/av_log statements
  Remove some silly disabled code.
  ac3dec: ensure get_buffer() gets a buffer for the correct number of channels

Conflicts:
	libavcodec/dnxhddec.c
	libavcodec/ffv1.c
	libavcodec/h264.c
	libavcodec/h264_parser.c
	libavcodec/mjpegdec.c
	libavcodec/motion_est_template.c
	libavcodec/mpegaudiodec.c
	libavcodec/mpegvideo_enc.c
	libavcodec/put_bits.h
	libavcodec/ratecontrol.c
	libavcodec/wmaenc.c
	libavdevice/timefilter.c
	libavformat/asfdec.c
	libavformat/avidec.c
	libavformat/avienc.c
	libavformat/flvenc.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-01 16:12:38 +02:00
compat MinGW: Use our snprintf/vsnprintf when MinGW's is broken 2012-09-25 18:14:14 -04:00
doc APIchanges: fill hashes. 2012-09-30 20:43:26 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2012-10-01 16:12:38 +02:00
libavdevice Merge remote-tracking branch 'qatar/master' 2012-10-01 16:12:38 +02:00
libavfilter lavfi/ashowinfo: check plane value before deferencing. 2012-09-30 21:00:52 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-10-01 16:12:38 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2012-09-14 14:13:38 +02:00
libavutil avformat: Remove non-compiling and/or silly commented-out printf/av_log statements 2012-10-01 10:24:28 +02:00
libpostproc postproc: Create version.h header 2012-09-28 15:06:26 +02:00
libswresample Add missing version macros to libraries 2012-09-28 15:10:18 +02:00
libswscale sws: drop unused variable 2012-09-30 23:14:20 +02:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests ffprobe: extend disposition printing support 2012-09-30 12:22:19 +02:00
tools Merge remote-tracking branch 'qatar/master' 2012-10-01 16:12:38 +02:00
.gitignore gitignore: codec_names.h is no more 2012-09-07 14:59:01 +02:00
arch.mak Optimization of AMR NB and WB decoders for MIPS 2012-06-11 21:12:39 +02:00
Changelog Move subrip/text API change info from Changelog to doc/APIchanges. 2012-09-30 20:38:05 +02:00
cmdutils.c cmdutils: sort codec lists. 2012-09-23 21:05:29 +02:00
cmdutils.h Merge commit 'ec36aa6944' 2012-08-31 13:01:30 +02:00
cmdutils_common_opts.h cmdutils: add -layouts option. 2012-08-28 15:09:49 +02:00
common.mak Merge remote-tracking branch 'qatar/master' 2012-09-16 14:55:00 +02:00
configure fate: Fix --disable-zlib 2012-09-29 16:09:05 +02:00
COPYING.GPLv2 Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1. 2009-06-05 09:51:31 +00:00
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 Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
Doxyfile Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
ffmpeg.c ffmpeg: disable buffering for stderr, needed for win32 runtime 2012-09-30 15:13:35 +02:00
ffmpeg.h ffmpeg: add option to control copying of frames prior to start. 2012-09-27 03:52:31 +02:00
ffmpeg_filter.c Merge commit '23aae62c2c' 2012-09-18 14:45:44 +02:00
ffmpeg_opt.c ffmpeg: add option to control copying of frames prior to start. 2012-09-27 03:52:31 +02:00
ffplay.c Merge commit '7751e4693d' 2012-09-25 15:15:16 +02:00
ffprobe.c ffprobe: extend disposition printing support 2012-09-30 12:22:19 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2012-10-01 16:12:38 +02:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
library.mak Merge commit '581281e242' 2012-09-20 03:20:29 +02:00
LICENSE LICENSE: correct incorrect claims on *GPL incompatibility 2012-08-16 04:47:18 +02:00
MAINTAINERS MAINTAINERS: add 1.0 2012-09-27 01:48:14 +02:00
Makefile Makefile: remove old codec_names.h on distclean 2012-09-07 14:59:01 +02:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE RELEASE: update for 1.0 2012-09-27 01:48:14 +02: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.