x/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-07-17 17:06:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,916 Commits 40 Branches 429 Tags
6cb2085278bdd3ee83d5ed528d98c78756ee7277
T
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
Michael Niedermayer 6cb2085278 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (27 commits)
  ppc: Add ff_ prefix to nonstatic symbols
  sh4: Add ff_ prefix to nonstatic symbols
  mpegvideo: Add ff_ prefix to nonstatic functions
  rtjpeg: Add ff_ prefix to nonstatic symbols
  rv: Add ff_ prefix to nonstatic symbols
  vp56: Add ff_ prefix to nonstatic symbols
  vorbis: Add ff_ prefix to nonstatic symbols
  msmpeg4: Add ff_ prefix to nonstatic symbols
  vc1: Add ff_ prefix to nonstatic symbols
  msmpeg4: Add ff_ prefixes to nonstatic symbols
  snow: Add ff_ prefix to nonstatic symbols
  mpeg12: Add ff_ prefix to nonstatic symbols
  mpeg4: Add ff_ prefixes to nonstatic symbols
  lagarith: Add ff_ prefix to lag_rac_init
  libavcodec: Add ff_ prefix to j_rev_dct*
  dsputil: Add ff_ prefix to inv_zigzag_direct16
  libavcodec: Prefix fdct_ifast, fdct_ifast248
  dsputil: Add ff_ prefix to the dsputil*_init* functions
  libavcodec: Add ff_ prefix to some nonstatic symbols
  vlc/rl: Add ff_ prefix to the nonstatic symbols
  ...

Conflicts:
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/dnxhddec.c
	libavcodec/ffv1.c
	libavcodec/h263.h
	libavcodec/h263dec.c
	libavcodec/h264.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/nuv.c
	libavcodec/ppc/dsputil_ppc.c
	libavcodec/proresdsp.c
	libavcodec/svq3.c
	libavcodec/version.h
	libavformat/dv.h
	libavformat/dvenc.c
	libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-16 01:34:37 +01:00
doc
prores encoder
2012-02-15 07:14:51 +01:00
ffpresets
Merge remote-tracking branch 'qatar/master'
2011-10-20 02:34:51 +02:00
libavcodec
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
libavdevice
Merge remote-tracking branch 'qatar/master'
2012-02-11 01:22:22 +01:00
libavfilter
af_pan: comment a tricky piece of code.
2012-02-15 20:04:05 +01:00
libavformat
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
libavutil
audioconvert: consistent use of FF_ARRAY_ELEMS for channel_layout_map.
2012-02-15 10:26:25 +01:00
libpostproc
build: Allow building old API/ABI libpostproc version
2012-01-24 17:01:10 +01:00
libswresample
libswresample: introduce int swr_set_compensation() instead of void swr_compensate()
2012-01-09 04:16:06 +01:00
libswscale
swscale: enable some more SIMD functions.
2012-02-15 00:41:40 +01:00
mt-work
Update todo
2011-06-12 18:01:29 +02:00
presets
Remove redundant libx264 preset files
2011-10-22 01:32:10 +02:00
tests
Merge remote-tracking branch 'qatar/master'
2012-02-14 03:24:27 +01:00
tools
Fix "ouput" typo and add a check.
2012-01-28 11:04:19 +01:00
.gitignore
Merge remote-tracking branch 'qatar/master'
2012-01-26 02:23:56 +01:00
Changelog
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
cmdutils_common_opts.h
ff*: add -max_alloc command line option
2011-12-25 18:55:43 +01:00
cmdutils.c
cmdutils: update copyright year to 2012.
2012-02-08 10:31:14 -08:00
cmdutils.h
Drop unnecessary prefix from *sink* variable and struct names.
2012-01-25 12:28:36 +01:00
common.mak
Add coverage support.
2011-12-05 20:04:48 +01:00
configure
Merge remote-tracking branch 'qatar/master'
2012-02-15 01:52:14 +01: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
remove avconv from Doxyfile
2012-01-25 22:47:45 +01:00
ffmpeg.c
ffmpeg: Fix image allocation.
2012-02-15 20:35:14 +01:00
ffplay.c
Merge remote-tracking branch 'qatar/master'
2012-02-07 01:40:29 +01:00
ffprobe.c
ffprobe: fix typo in ESCAPE_CHECK_SIZE
2012-02-06 11:30:45 +01:00
ffserver.c
ffserver: use avcodec_get_context_defaults3()
2012-02-07 05:51:31 +01:00
INSTALL
Merge remote branch 'qatar/master'
2011-04-08 02:50:13 +02:00
library.mak
Merge remote-tracking branch 'qatar/master'
2011-12-18 03:04:44 +01:00
LICENSE
libaac+ support
2011-09-26 02:28:21 +02:00
MAINTAINERS
maintainers: add myself for recent works.
2012-01-24 16:07:53 +01:00
Makefile
Merge remote-tracking branch 'qatar/master'
2012-02-04 02:34:14 +01:00
README
cosmetics: fix dashed line length after 070c5d0
2011-03-28 09:53:40 +02:00
RELEASE
Merge remote-tracking branch 'qatar/master'
2012-01-21 23:11:27 +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.

2) Licensing
------------

* See the LICENSE file.
Reference in New Issue View Git Blame Copy Permalink
S
Description
MIRROR: FFmpeg is a collection of libraries and tools to process multimedia content
Readme
265 MiB
Languages
C 89%
Assembly 8.4%
Makefile 1.4%
GLSL 0.4%
C++ 0.3%
Other 0.2%