RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-05 06:13:43 +00:00
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
56,872 Commits 37 Branches 400 Tags 265 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
ee77140afa
Go to file
Michael Niedermayer ee77140afa Merge commit 'b2bed9325dbd6be0da1d91ffed3f513c40274fd2' 
* commit 'b2bed9325dbd6be0da1d91ffed3f513c40274fd2':
  cosmetics: Group .name and .long_name together in codec/format declarations

Conflicts:
	libavcodec/8svx.c
	libavcodec/alac.c
	libavcodec/cljr.c
	libavcodec/dnxhddec.c
	libavcodec/dnxhdenc.c
	libavcodec/dpxenc.c
	libavcodec/dvdec.c
	libavcodec/dvdsubdec.c
	libavcodec/dvdsubenc.c
	libavcodec/ffv1dec.c
	libavcodec/flacdec.c
	libavcodec/flvdec.c
	libavcodec/fraps.c
	libavcodec/frwu.c
	libavcodec/g726.c
	libavcodec/gif.c
	libavcodec/gifdec.c
	libavcodec/h261dec.c
	libavcodec/h263dec.c
	libavcodec/iff.c
	libavcodec/imc.c
	libavcodec/libopencore-amr.c
	libavcodec/libopenjpegdec.c
	libavcodec/libopenjpegenc.c
	libavcodec/libspeexenc.c
	libavcodec/libvo-amrwbenc.c
	libavcodec/libvorbisenc.c
	libavcodec/libvpxenc.c
	libavcodec/libx264.c
	libavcodec/libxavs.c
	libavcodec/libxvid.c
	libavcodec/ljpegenc.c
	libavcodec/mjpegbdec.c
	libavcodec/mjpegdec.c
	libavcodec/mpeg12dec.c
	libavcodec/mpeg4videodec.c
	libavcodec/msmpeg4dec.c
	libavcodec/pgssubdec.c
	libavcodec/pngdec.c
	libavcodec/pngenc.c
	libavcodec/proresdec_lgpl.c
	libavcodec/proresenc_kostya.c
	libavcodec/ra144enc.c
	libavcodec/rawdec.c
	libavcodec/rv10.c
	libavcodec/sp5xdec.c
	libavcodec/takdec.c
	libavcodec/tta.c
	libavcodec/v210dec.c
	libavcodec/vp6.c
	libavcodec/wavpack.c
	libavcodec/xbmenc.c
	libavcodec/yop.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-04 12:34:23 +02:00
compat
doc avcodec: add av_codec_get_max_lowres() 2013-10-03 16:33:09 +02:00
libavcodec Merge commit 'b2bed9325dbd6be0da1d91ffed3f513c40274fd2' 2013-10-04 12:34:23 +02:00
libavdevice
libavfilter avfilter/vf_frei0r: fix out of array read 2013-10-04 11:16:35 +02:00
libavformat Merge commit '49fe9c05f97bc2cfafd8fdcfea2f313d7c8e2c48' 2013-10-04 12:01:17 +02:00
libavresample
libavutil Merge commit '80fefbed623491b92fe59ead99225f99c0d0ca08' 2013-10-04 11:28:21 +02:00
libpostproc
libswresample swr: fix example code and doxy indent. 2013-09-29 23:37:46 +02:00
libswscale swscale/utils: dont divide by zero with zero vectors 2013-10-01 00:27:28 +02:00
presets
tests avformat/vobsub: raise packet even if apparently incomplete. 2013-10-04 09:25:11 +00:00
tools ffhash: Change size to an int 2013-09-24 16:29:18 +02:00
.gitignore
arch.mak
Changelog Native VP9 decoder. 2013-10-02 21:03:11 -04:00
cmdutils_common_opts.h
cmdutils.c cmdutils: print command support in -filters. 2013-09-30 10:15:22 +00:00
cmdutils.h
common.mak Merge commit '47b6cfc2a0333fb24f074d27830bf35ae5007050' 2013-10-04 11:49:01 +02:00
configure Merge remote-tracking branch 'rbultje/master' 2013-10-03 13:56:52 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c ffmpeg: avoid direct access to lowres use av_codec_g/set_lowres() 2013-10-03 17:20:53 +02:00
ffmpeg.c ffmpeg: dont return reserved values 2013-10-02 12:59:39 +02:00
ffmpeg.h
ffplay.c ffplay: avoid direct access to lowres use av_codec_g/set_lowres() 2013-10-03 22:38:54 +02:00
ffprobe.c ffprobe: print stream channel_layout when available 2013-10-03 09:19:38 +02:00
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS lavf/libssh: add MAINTAINERS entry 2013-09-21 16:35:41 +02:00
Makefile
README
RELEASE
version.sh

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.