virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity
Mirror of https://git.ffmpeg.org/ffmpeg.git
59,725 Commits 37 Branches 400 Tags 470 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
268d931724
Go to file
Michael Niedermayer 268d931724 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  ATRAC3+ decoder

Conflicts:
	Changelog
	configure
	libavcodec/atrac3plus.c
	libavcodec/atrac3plus.h
	libavcodec/atrac3plus_data.h
	libavcodec/atrac3plusdec.c
	libavcodec/atrac3plusdsp.c
	libavcodec/version.h

See: 2e1fb96af3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-09 20:58:03 +01:00
compat
doc ATRAC3+ decoder 2014-01-09 19:33:07 +01:00
libavcodec Merge remote-tracking branch 'qatar/master' 2014-01-09 20:58:03 +01:00
libavdevice
libavfilter avfilter: avfilter_register() that works in O(1) time 2014-01-09 00:53:04 +01:00
libavformat ATRAC3+ decoder 2014-01-09 19:33:07 +01:00
libavresample
libavutil Merge commit '5dae4872357613a0b51120b54a4c5221e0ec3f69' 2014-01-08 05:36:56 +01:00
libpostproc
libswresample
libswscale swscale: disable ARM code until its build failure with clang/iphone is fixed 2014-01-08 17:17:34 +01:00
presets
tests Merge commit 'a246af86e47044dec243db2f708cc125d608ea78' 2014-01-09 15:05:44 +01:00
tools tools/qt-faststart: add -movflags +faststart note 2014-01-07 10:59:04 -09:00
.gitignore
arch.mak
Changelog ATRAC3+ decoder 2014-01-09 19:33:07 +01:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c
cmdutils.h
common.mak
configure ATRAC3+ decoder 2014-01-09 19:33:07 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg_vdpau.c
ffmpeg.c
ffmpeg.h
ffplay.c
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE
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.