Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity
No description
62811 commits 38 branches 400 tags 186 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
Find a file
Michael Niedermayer 03b88f6b39 Merge remote-tracking branch 'cigaes/master' 
* cigaes/master:
  lavfi/drawtext: allow to format pts as HH:MM:SS.mmm.
  lavf/concatdec: implement automatic conversions.
  lavf/concatdec: reindent after last commit.
  lavf/concatdec: always do stream matching.
  lavf/concatdec: check match_streams() return value.
  lavf/concatdec: use a structure for each stream.
  ffprobe: use the codec descriptor if no decoder was found.
  lavf/matroska: add "binary" pseudo-MIME type.
  lavc: minor bump and APIchanges for AVCodecDescriptor.mime_types.
  lavc: add a mime_types field to codec descriptors.
  lavc: add AV_CODEC_ID_BIN_DATA.
  lavc: add codec descriptors for TTF and OTF.
  lavc: add codec descriptors for deprecated ids.
  lavc/codec_desc: add separation comment.
  tools/ffhash: implement base64 output.
  tools/ffhash: use av_hash_final_hex().
  lavu/hash: add hash_final helpers.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-29 19:29:48 +02:00
compat Merge remote-tracking branch 'qatar/master' 2014-03-10 12:05:02 +01:00
doc Merge remote-tracking branch 'cigaes/master' 2014-04-29 19:29:48 +02:00
libavcodec Merge remote-tracking branch 'cigaes/master' 2014-04-29 19:29:48 +02:00
libavdevice Fix convertion typos 2014-04-29 00:09:08 +02:00
libavfilter lavfi/drawtext: allow to format pts as HH:MM:SS.mmm. 2014-04-29 13:25:59 +02:00
libavformat Merge remote-tracking branch 'cigaes/master' 2014-04-29 19:29:48 +02:00
libavresample Merge commit 'a24a252709dd38f12aa4929ce4981f87091a5113' 2014-04-25 01:19:27 +02:00
libavutil lavu/hash: add hash_final helpers. 2014-04-29 13:24:11 +02:00
libpostproc Fix libpostproc compilation with !HAVE_6REGS. 2014-04-24 17:50:02 +02:00
libswresample Fix convertion typos 2014-04-29 00:09:08 +02:00
libswscale Fix teh typos 2014-04-27 15:16:13 +02:00
presets
tests avformat/utils: prevent r frame rate from being set larger than 1/tb 2014-04-28 15:49:51 +02:00
tools lavc: add codec descriptors for TTF and OTF. 2014-04-29 13:24:18 +02:00
.gitignore examples: rename avcodec.c to decoding_encoding.c 2014-04-23 10:32:42 +02:00
arch.mak Merge commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14' 2014-04-07 02:15:18 +02:00
Changelog Merge commit '35177ba77ff60a8b8839783f57e44bcc4214507a' 2014-04-29 01:22:22 +02:00
cmdutils.c cmdutils: preserve unchanged log flags when setting AV_LOG_SKIP_REPEATED 2014-04-26 19:21:59 +02:00
cmdutils.h Merge commit '85698be461c07be10d873dd34348bcfe9ffc56e0' 2014-03-29 14:33:39 +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
common.mak lavd: Add QTKit input device. 2014-03-30 20:45:07 +02:00
configure Merge commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a' 2014-04-29 01:47:53 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg.c ffmpeg: print an error at the end if conversion failed 2014-04-29 00:09:08 +02:00
ffmpeg.h Merge commit '35177ba77ff60a8b8839783f57e44bcc4214507a' 2014-04-29 01:22:22 +02:00
ffmpeg_dxva2.c ffmpeg_dxva2: fix mixing of declarations and statements 2014-04-29 01:54:42 +02:00
ffmpeg_filter.c ffmpeg_filter: make *jpeg_formats static const 2014-04-28 00:22:38 +02:00
ffmpeg_opt.c Merge commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a' 2014-04-29 01:47:53 +02:00
ffmpeg_vdpau.c
ffplay.c avformat: add av_format_inject_global_side_data(), and disable it by default 2014-04-15 02:37:40 +02:00
ffprobe.c ffprobe: use the codec descriptor if no decoder was found. 2014-04-29 13:25:59 +02:00
ffserver.c ffserver: do not ignore lseek() return 2014-04-29 01:08:06 -04:00
INSTALL
library.mak Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90' 2014-02-17 02:22:01 +01:00
LICENSE Add libx265 encoder 2014-02-12 13:13:17 +00:00
MAINTAINERS MAINTAINERS: Add myself as FIC maintainer 2014-04-21 21:27:32 -04:00
Makefile Merge commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a' 2014-04-29 01:47:53 +02:00
README
RELEASE Prepare for 11_alpha1 Release 2014-03-13 08:24:11 -04: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.