har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
35,425 Commits 2 Branches 401 Tags
Go to file
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
Michael Niedermayer 7f92f3d812 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  h264: fix frame reordering code.
  fate: Add a test for the VBLE decoder
  doc: break some long lines in developer.texi
  drawtext: make x and y parametric
  drawtext: manage memory allocation better
  drawtext: refactor draw_text
  doc: remove space between variable and post increment in example code

Conflicts:
	doc/developer.texi
	doc/filters.texi
	libavcodec/h264.c
	libavfilter/vf_drawtext.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-04 01:02:37 +01:00
doc
Merge remote-tracking branch 'qatar/master'
2011-12-04 01:02:37 +01:00
ffpresets
Merge remote-tracking branch 'qatar/master'
2011-10-20 02:34:51 +02:00
libavcodec
Merge remote-tracking branch 'qatar/master'
2011-12-04 01:02:37 +01:00
libavdevice
lavf: rename remaining av_set_pts_info() to avpriv_set_pts_info().
2011-12-03 03:24:32 +01:00
libavfilter
drawtext: make x and y parametric
2011-12-03 01:35:29 +01:00
libavformat
flvdec: Stop searching for streams once a audio & a video stream has been found
2011-12-03 21:39:53 +01:00
libavutil
lavu/error: define AVERROR_BUG.
2011-12-03 15:18:58 +01:00
libpostproc
postproc: remove stray +
2011-10-30 18:11:09 +01:00
libswresample
swr-test: drop one const, silence most const qualifer warnings.
2011-12-03 00:46:46 +01:00
libswscale
swscale: Fix all cast qualifier warnings:
2011-12-03 00:12:56 +01:00
mt-work
…
presets
Remove redundant libx264 preset files
2011-10-22 01:32:10 +02:00
tests
Merge remote-tracking branch 'qatar/master'
2011-12-04 01:02:37 +01:00
tools
lavfi-showfiltfmts.c: fix handling of null names
2011-11-26 18:12:25 +01:00
.gitignore
…
avconv.c
Merge remote-tracking branch 'qatar/master'
2011-12-03 03:00:30 +01:00
Changelog
Merge remote-tracking branch 'qatar/master'
2011-12-02 00:51:11 +01:00
cmdutils_common_opts.h
…
cmdutils.c
cmdutils: pass AVCodec to filter_codec_opts()
2011-11-27 21:17:56 +01:00
cmdutils.h
cmdutils: pass AVCodec to filter_codec_opts()
2011-11-27 21:17:56 +01:00
common.mak
Add rule for compiling to asm
2011-10-22 20:49:24 +02:00
configure
configure: add forgotten libx264rgb_encoder_deps
2011-12-01 22:29:58 +01:00
COPYING.GPLv2
…
COPYING.GPLv3
…
COPYING.LGPLv2.1
…
COPYING.LGPLv3
…
CREDITS
…
Doxyfile
…
ffmpeg.c
ffmpeg: use standard duration calculation code in the stream copy case.
2011-12-03 15:15:06 +01:00
ffplay.c
ffplay: Copy audio side data too. This fixes handling of some rare nellymoser files that change the sample rate mid stream (sample file at: http://trac.videolan.org/vlc/ticket/5586)
2011-12-01 20:55:01 +01:00
ffprobe.c
ffprobe: print codec timecode if available.
2011-11-28 14:06:02 +01:00
ffserver.c
ffserver: use av_noreturn
2011-11-11 04:25:53 +01:00
INSTALL
…
LICENSE
…
MAINTAINERS
MAINTAINERS: add myself as a web site maintainer
2011-11-21 00:07:52 +01:00
Makefile
Merge remote-tracking branch 'qatar/master'
2011-10-20 02:34:51 +02:00
README
…
RELEASE
RELEASE: We're now at 0.8.7.git
2011-11-25 14:37:35 +01:00
subdir.mak
Add rule for compiling to asm
2011-10-22 20:49:24 +02:00
version.sh
…

README 

FFmpeg README
-------------

1) Documentation
----------------

* Read the documentation in the doc/ directory.

2) Licensing
------------

* See the LICENSE file.
Description
FFmpeg with added filter to color correct dive videos
Readme 432 MiB
Languages
C 90.6%
Assembly 7.5%
Makefile 1.3%
C++ 0.2%
Objective-C 0.1%
Other 0.1%