virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
Mirror of https://git.ffmpeg.org/ffmpeg.git
59,725 Commits 37 Branches 400 Tags 460 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 compat: provide va_copy for old gcc versions. 2013-12-30 12:38:03 +01:00
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 pulse: get latency only when needed 2014-01-05 18:44:18 +01:00
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 Merge commit 'cc976a75dffa148d655b52604331679ff669e8a2' 2014-01-04 02:30:07 +01:00
libavutil Merge commit '5dae4872357613a0b51120b54a4c5221e0ec3f69' 2014-01-08 05:36:56 +01:00
libpostproc postproc: fix null pointer dereference with invalid option strings 2013-12-11 22:28:42 +01:00
libswresample Avoid using empty macro arguments. 2013-12-31 12:19:59 +01:00
libswscale swscale: disable ARM code until its build failure with clang/iphone is fixed 2014-01-08 17:17:34 +01:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
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 Merge commit '3cd612d44789948f72b52944474e0870c5c60964' 2013-12-01 21:18:11 +01:00
arch.mak Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30' 2012-12-08 14:24:16 +01:00
Changelog ATRAC3+ decoder 2014-01-09 19:33:07 +01:00
cmdutils_common_opts.h Allow hiding the banner. 2013-12-29 22:57:20 +01:00
cmdutils_opencl.c cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices 2013-12-09 21:21:36 +01:00
cmdutils.c cmdutils: update copyright year to 2014. 2014-01-05 22:39:35 +02:00
cmdutils.h Allow hiding the banner. 2013-12-29 22:57:20 +01:00
common.mak common.mak: Less ugly version of the previous windres fix 2013-12-09 02:47:55 +01:00
configure ATRAC3+ decoder 2014-01-09 19:33:07 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS CREDITS: redirect to Git log, remove current outdated content 2013-01-31 18:02:52 +01:00
ffmpeg_filter.c Merge remote-tracking branch 'qatar/master' 2013-11-24 05:21:19 +01:00
ffmpeg_opt.c ffmpeg: do not fail when options are routed to libavformat and libavcodec and only one can be used 2014-01-03 02:24:27 +01:00
ffmpeg_vdpau.c Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea' 2013-11-23 14:46:48 +01:00
ffmpeg.c ffmpeg: use timestamp from before and after the decoder to detect backward moving dts for discontinuity detection 2013-12-22 19:48:00 +01:00
ffmpeg.h Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea' 2013-11-23 14:46:48 +01:00
ffplay.c ffplay: do not wait for the picture allocation to finish on exit 2013-12-29 13:19:19 +01:00
ffprobe.c ffprobe: check av_frame_alloc() failure. 2013-12-30 10:58:01 +01:00
ffserver.c ffserver: extend report_config_error() facilities, and use it for warnings 2013-12-16 19:19:04 +01:00
INSTALL
library.mak Add Windows resource file support for shared libraries 2013-12-05 23:42:07 +01:00
LICENSE libavfilter/vf_noise: relicense to LGPL 2013-10-27 20:29:07 +00:00
MAINTAINERS MAINTAINERS: add myself for spdif* and hls.c 2014-01-03 15:05:48 +02:00
Makefile cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices 2013-12-09 21:21:36 +01:00
README
RELEASE RELEASE: update to 2.1.git 2013-11-29 16:41:42 +01:00
version.sh version.sh: add preprocessing guards 2013-11-30 21:42:03 +01:00

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.