RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
47,531 Commits 36 Branches 392 Tags 305 MiB
C 90.4%
Assembly 7.7%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
Go to file
Michael Niedermayer 54a71f2e6c Merge commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56' 
* commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56':
  pixdesc: fix yuva 10bit bit depth
  avconv: deprecate the -vol option
  x86: af_volume: add SSE2/SSSE3/AVX-optimized s32 volume scaling
  x86: af_volume: add SSE2-optimized s16 volume scaling

Conflicts:
	ffmpeg.c
	tests/ref/lavfi/pixdesc
	tests/ref/lavfi/pixfmts_copy
	tests/ref/lavfi/pixfmts_null
	tests/ref/lavfi/pixfmts_scale
	tests/ref/lavfi/pixfmts_vflip

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 		2012-12-06 15:55:47 +01:00
compat Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff' 2012-10-24 13:42:58 +02:00
doc Merge commit 'b384e031daeb1ac612620985e3e5377bc587559c' 2012-12-06 15:18:59 +01:00
libavcodec h264: slice-mt: check master context for valid current_picture_ptr 2012-12-06 04:45:04 +01:00
libavdevice lavd/lavfi: fix float.h include. 2012-12-06 15:09:47 +01:00
libavfilter Merge commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56' 2012-12-06 15:55:47 +01:00
libavformat lavf: add a concat demuxer. 2012-12-06 14:09:14 +01:00
libavresample Merge commit 'f5fa03660db16f9d78abc5a626438b4d0b54f563' 2012-11-28 13:27:18 +01:00
libavutil Merge commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56' 2012-12-06 15:55:47 +01:00
libpostproc pp: add SSE2 deInterlaceInterpolateCubic(). 2012-11-18 16:21:59 +01:00
libswresample resample: remove disabled debug code 2012-12-06 02:51:26 +01:00
libswscale swscale: fix 12 and 14 bit YUV planar output with scaling. 2012-12-01 03:41:24 +01:00
presets
…
tests lavfi/silencedetect: use eval builtin to parse dB. 2012-12-06 15:08:38 +01:00
tools Replace rest of libavutil/audioconvert.h with libavutil/channel_layout.h 2012-11-13 13:21:21 +00:00
.gitignore Add examples/resampling_audio to .gitignore. 2012-12-06 12:13:01 +01:00
COPYING.GPLv2
…
COPYING.GPLv3
…
COPYING.LGPLv2.1
…
COPYING.LGPLv3
…
CREDITS
…
Changelog lavf: add a concat demuxer. 2012-12-06 14:09:14 +01:00
INSTALL
…
LICENSE lavfi: add geq filter. 2012-11-11 23:12:54 +01:00
MAINTAINERS MAINTAINERS: fix entry for img2 2012-11-06 01:46:21 +01:00
Makefile Merge commit '4a606c830ae664013cea33800094d4d0f4ec62da' 2012-11-23 13:30:51 +01:00
README
…
RELEASE Merge commit 'ceb754d041f5f6327fd9195a5f43575af9516daa' 2012-10-24 14:01:36 +02:00
arch.mak
…
cmdutils.c Merge commit 'ff953fecffd3b9a616a046723fb9d4690be032a6' 2012-12-05 15:58:07 +01:00
cmdutils.h Revert "cmdutils: allow specifying the file for -report" 2012-11-04 10:47:52 +01:00
cmdutils_common_opts.h Revert "cmdutils: allow specifying the file for -report" 2012-11-04 10:47:52 +01:00
common.mak Merge commit '4a606c830ae664013cea33800094d4d0f4ec62da' 2012-11-23 13:30:51 +01:00
configure Merge remote-tracking branch 'qatar/master' 2012-12-04 14:23:22 +01:00
ffmpeg.c ffmpeg: small indent fix. 2012-12-04 16:40:11 +01:00
ffmpeg.h ffmpeg: fix swr filter_type for auto inserted aresample filters 2012-11-26 04:06:19 +01:00
ffmpeg_filter.c Merge commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56' 2012-12-06 15:55:47 +01:00
ffmpeg_opt.c ffmpeg: use avformat_seek_file() instead of av_seek_frame(). 2012-12-02 00:06:02 +01:00
ffplay.c Merge remote-tracking branch 'qatar/master' 2012-11-29 14:22:58 +01:00
ffprobe.c ffprobe: free dictionary in opt_show_entries() 2012-11-23 18:49:26 +01:00
ffserver.c ffserver remove CONFIG_NOCUTILS check 2012-11-27 14:41:41 +01:00
library.mak Merge commit '4a606c830ae664013cea33800094d4d0f4ec62da' 2012-11-23 13:30:51 +01:00
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.