RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-05 06:40:03 +00:00
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
65,156 Commits 37 Branches 400 Tags 251 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
f54e01c24e
Go to file
Michael Niedermayer f54e01c24e Merge commit 'a786c8259dafeca9744252230b5d78f67810770c' 
* commit 'a786c8259dafeca9744252230b5d78f67810770c':
  idct: Split off Xvid IDCT

Conflicts:
	libavcodec/Makefile
	libavcodec/mpeg4videodec.c
	libavcodec/x86/Makefile
	libavcodec/x86/idctdsp_init.c

This split is somewhat restructured leaving the xvid IDCT available
outside mpeg4 if manually selected.

The code also could not be merged unchanged as it conflicted with a
bugfix in FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-01 16:21:52 +02:00
compat
doc Add forgotten APIchanges entry for probesize2. 2014-08-01 12:49:56 +02:00
libavcodec Merge commit 'a786c8259dafeca9744252230b5d78f67810770c' 2014-08-01 16:21:52 +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 avfilter/vf_pullup: 2nd try to workaround gcc 4.4.3 bug on arm 2014-08-01 14:17:53 +02:00
libavformat
libavresample
libavutil avutil/pixdesc: remove unneeded assignment 2014-07-31 20:44:46 +02:00
libpostproc
libswresample
libswscale
presets
tests Merge commit '706208ef47bffd525c982975d2756f7b2b220b8d' 2014-08-01 15:03:22 +02:00
tools
.gitignore Merge commit '706208ef47bffd525c982975d2756f7b2b220b8d' 2014-08-01 15:03:22 +02:00
arch.mak
Changelog
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c
cmdutils.h
common.mak
configure
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_dxva2.c
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg_vda.c
ffmpeg_vdpau.c
ffmpeg.c
ffmpeg.h
ffplay.c
ffprobe.c
ffserver.c
INSTALL.md
library.mak
LICENSE.md
MAINTAINERS
Makefile
README.md
RELEASE
RELEASE_NOTES
version.sh

README.md

FFmpeg README

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