wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
No description
43618 commits 40 branches 405 tags 230 MiB
Find a file
Michael Niedermayer c581cb4e4f Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Fix even more missing includes after the common.h removal
  build: Factor out rangecoder dependencies to CONFIG_RANGECODER
  build: Factor out error resilience dependencies to CONFIG_ERROR_RESILIENCE
  x86: avcodec: Consistently name all init files
  Add more missing includes after removing the implicit common.h
  Add some more missing includes after removing the implicit common.h
  Don't include common.h from avutil.h
  rtmp: Automatically compute the hash for SWFVerification

Conflicts:
	configure
	doc/APIchanges
	doc/examples/decoding_encoding.c
	libavcodec/Makefile
	libavcodec/assdec.c
	libavcodec/audio_frame_queue.c
	libavcodec/avpacket.c
	libavcodec/dv_profile.c
	libavcodec/dwt.c
	libavcodec/libtheoraenc.c
	libavcodec/rawdec.c
	libavcodec/rv40dsp.c
	libavcodec/tiff.c
	libavcodec/tiffenc.c
	libavcodec/v210dec.h
	libavcodec/vc1dsp.c
	libavcodec/x86/Makefile
	libavfilter/asrc_anullsrc.c
	libavfilter/avfilter.c
	libavfilter/buffer.c
	libavfilter/formats.c
	libavfilter/vf_ass.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fade.c
	libavfilter/vf_select.c
	libavfilter/video.c
	libavfilter/vsrc_testsrc.c
	libavformat/version.h
	libavutil/audioconvert.c
	libavutil/error.h
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-16 16:20:30 +02:00
compat Merge remote-tracking branch 'qatar/master' 2012-07-12 23:57:00 +02:00
doc Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
libavdevice Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
libavfilter Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
libpostproc Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00
libswresample Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00
libswscale Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
mt-work Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests srtenc: Add timing-less "subrip" encoder. 2012-08-15 20:46:54 -07:00
tools Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
.gitignore Merge remote-tracking branch 'qatar/master' 2012-08-09 00:51:02 +02:00
arch.mak Optimization of AMR NB and WB decoders for MIPS 2012-06-11 21:12:39 +02:00
Changelog srtenc: Add timing-less "subrip" encoder. 2012-08-15 20:46:54 -07:00
cmdutils.c cmdutils: show options in show_help_children only if the context has options 2012-08-10 23:14:44 +02:00
cmdutils.h Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
cmdutils_common_opts.h cmdutils: fix -fdebug without -v xy 2012-04-05 21:50:50 +02:00
common.mak checkheaders: Rename HEADEROBJS to HOBJS 2012-08-09 05:02:45 +02:00
configure Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +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 Merge remote-tracking branch 'qatar/master' 2012-08-14 15:34:39 +02:00
ffmpeg.h ffmpeg: add an option to fix subtitles durations. 2012-08-14 11:17:45 +02:00
ffmpeg_filter.c Merge remote-tracking branch 'qatar/master' 2012-08-09 00:51:02 +02:00
ffmpeg_opt.c ffmpeg: make -s work for subtitles too. 2012-08-14 11:17:45 +02:00
ffplay.c ffplay: reque attached pictures on channel changes. 2012-08-16 04:38:54 +02:00
ffprobe.c Merge remote-tracking branch 'qatar/master' 2012-08-14 15:34:39 +02:00
ffserver.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
library.mak Merge remote-tracking branch 'qatar/master' 2012-08-09 00:51:02 +02:00
LICENSE LICENSE: correct incorrect claims on *GPL incompatibility 2012-08-16 04:47:18 +02:00
MAINTAINERS Canopus Lossless decoder 2012-08-01 22:02:19 -04:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-08-10 04:46:13 +02:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE RELEASE: update, seem this has been forgotten 2012-07-01 21:21:07 +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.