RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-24 08:12:44 +00:00
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
65,262 Commits 37 Branches 400 Tags 244 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
491c52d3b0
Go to file
Michael Niedermayer 491c52d3b0 Merge commit 'eb9244f20210fd420fb9b3c98126f9cae525d1cc' 
* commit 'eb9244f20210fd420fb9b3c98126f9cae525d1cc':
  Add Icecast protocol

Conflicts:
	Changelog
	configure
	doc/protocols.texi
	libavformat/icecast.c
	libavformat/version.h

See: e3dc2c86fc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-04 14:14:13 +02:00
compat
doc Merge commit 'eb9244f20210fd420fb9b3c98126f9cae525d1cc' 2014-08-04 14:14:13 +02:00
libavcodec Merge commit '1ef9e8376466bb1e2c147e47554b94cab9c8b04a' 2014-08-04 06:11:34 +02:00
libavdevice avdevice/oss_audio: Check SNDCTL_DSP_GETFMTS failure, print a warning but continue 2014-07-31 21:19:15 +02:00
libavfilter Merge commit '1ef9e8376466bb1e2c147e47554b94cab9c8b04a' 2014-08-04 06:11:34 +02:00
libavformat Merge commit 'eb9244f20210fd420fb9b3c98126f9cae525d1cc' 2014-08-04 14:14:13 +02:00
libavresample Merge commit 'fbc0b8659967ea54a8472b5f795270d38bb085dd' 2014-08-04 02:49:48 +02:00
libavutil Merge commit 'bb41115d56930b9f5d59e79dca254d1201246967' 2014-08-04 12:41:15 +02:00
libpostproc
libswresample swresample/swresample: Treat mono as planar 2014-08-04 03:05:05 +02:00
libswscale
presets
tests Merge commit 'caf5ef852bf71984d3322bbeaf48cfb04ac8255f' 2014-08-04 04:05:36 +02:00
tools
.gitignore Merge commit '706208ef47bffd525c982975d2756f7b2b220b8d' 2014-08-01 15:03:22 +02:00
arch.mak
Changelog libavformat: Add Icecast protocol 2014-08-04 13:33:44 +02:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c
cmdutils.h
common.mak
configure Merge commit 'eb9244f20210fd420fb9b3c98126f9cae525d1cc' 2014-08-04 14:14:13 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_dxva2.c
ffmpeg_filter.c ffmpeg_filter: refuse to configure input without a decoder. 2014-07-30 14:40:45 +02:00
ffmpeg_opt.c ffmpeg: Do not fail if a demuxer and decoder use the same option identifer 2014-08-04 13:33:44 +02:00
ffmpeg_vda.c
ffmpeg_vdpau.c
ffmpeg.c ffmpeg: Do not fail if a demuxer and decoder use the same option identifer 2014-08-04 13:33:44 +02:00
ffmpeg.h ffmpeg: Do not fail if a demuxer and decoder use the same option identifer 2014-08-04 13:33:44 +02:00
ffplay.c
ffprobe.c ffprobe: print some basic information about avframe side data 2014-07-30 19:23:08 +02:00
ffserver.c ffserver: initialize pbuffer in prepare_sdp_description() 2014-08-02 18:32:37 +02:00
INSTALL.md
library.mak
LICENSE.md
MAINTAINERS MAINTAINERS: update list of releases i maintain 2014-07-28 06:16:34 +02:00
Makefile
README.md
RELEASE RELEASE: update, we are after 2.3 not 2.2 2014-07-28 03:11:04 +02:00
RELEASE_NOTES RELEASE_NOTES: fix WebVTT decoder typo (-> encoder) 2014-07-25 13:22:00 +02:00
version.sh version.sh: Print versions based on the last git tag for release branches 2014-07-28 15:44:59 +02:00

README.md

FFmpeg README

  1. Documentation
  1. Licensing
  • See the LICENSE file.
  1. Build and Install
  • See the INSTALL file.