RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-08 23:58:51 +00:00
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
65,156 Commits 37 Branches 400 Tags 267 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 avformat/hlsenc: add some empty lines to make the code easier to read 2014-07-31 00:33:49 +02:00
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 Merge commit 'a0ce85ac7de098d3f9b53b51b77a09bad700a011' 2014-07-30 23:34:25 +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 Merge commit 'dc71f1958846bb1d96de43a4603983dc8450cfcc' 2014-07-29 00:06:32 +02:00
ffmpeg_vda.c
ffmpeg_vdpau.c
ffmpeg.c
ffmpeg.h
ffplay.c
ffprobe.c ffprobe: print some basic information about avframe side data 2014-07-30 19:23:08 +02:00
ffserver.c
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
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.