RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-30 03:13:18 +00:00
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
56,446 Commits 37 Branches 400 Tags 262 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
b26ccf218d
Go to file
Michael Niedermayer b26ccf218d Merge commit 'c4bfa098072ba338d83555d6e2199f7e1e64ffff' 
* commit 'c4bfa098072ba338d83555d6e2199f7e1e64ffff':
  Add a WebP decoder

Conflicts:
	Changelog
	doc/general.texi
	libavcodec/Makefile
	libavcodec/avcodec.h
	libavcodec/version.h
	libavformat/img2.c

The previously existing webp decoder is disabled as the new
one supports lossless mode and alpha while the previous does not.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-19 12:36:11 +02:00
compat
doc Merge commit 'c4bfa098072ba338d83555d6e2199f7e1e64ffff' 2013-09-19 12:36:11 +02:00
libavcodec Merge commit 'c4bfa098072ba338d83555d6e2199f7e1e64ffff' 2013-09-19 12:36:11 +02:00
libavdevice lavd/v4l2: do not fail when VIDIOC_ENUMSTD returns EINVAL without a valid match 2013-09-17 22:57:31 +02:00
libavfilter avfilter/vf_telecine: remove redudant av_frame_copy_props() 2013-09-18 19:17:34 +00:00
libavformat rtmp: Unbreak handle_notify 2013-09-19 11:27:21 +02:00
libavresample
libavutil OpenCL: convert meaningless "device id" output to "device name" 2013-09-17 21:21:11 +02:00
libpostproc
libswresample
libswscale swscale/utils: remove redundant NULL checks before sws_freeVec() 2013-09-17 21:48:54 +02:00
presets
tests matroskaenc: Write muxingapp and writingapp elements when using bitexact flag 2013-09-18 23:06:59 +02:00
tools
.gitignore
arch.mak
Changelog Merge commit 'c4bfa098072ba338d83555d6e2199f7e1e64ffff' 2013-09-19 12:36:11 +02:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure Add a WebP decoder 2013-09-18 14:10:05 -04:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg.c
ffmpeg.h
ffplay.c
ffprobe.c ffprobe: add -read_intervals option 2013-09-19 10:10:30 +02:00
ffserver.c
INSTALL
library.mak
LICENSE avfilter: port pullup filter from libmpcodecs 2013-09-17 17:03:36 +00:00
MAINTAINERS
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.