Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity
No description
31404 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 3602ad7ee6 Merge commit '142e76f1055de5dde44696e71a5f63f2cb11dedf' 
* commit '142e76f1055de5dde44696e71a5f63f2cb11dedf':
  swscale: fix crash with dithering due incorrect offset calculation.
  matroskadec: fix stupid typo (!= -> ==)
  build: remove duplicates from order-only directory prerequisite list
  build: rework rules for things in the tools dir
  configure: fix --cpu=host with gcc 4.6
  ARM: use const macro to define constant data in asm
  bitdepth: simplify FUNC/FUNCC macros
  dsputil: remove ff_emulated_edge_mc macro used in one place
  9/10-bit: simplify clipping macros
  matroskadec: reindent
  matroskadec: defer parsing of cues element until we seek.
  lavc: add support for codec-specific defaults.
  lavc: make avcodec_alloc_context3 officially public.
  lavc: remove a half-working attempt at different defaults for audio/video codecs.
  ac3dec: add a drc_scale private option
  lavf: add avformat_find_stream_info()
  lavc: introduce avcodec_open2() as a replacement for avcodec_open().

Conflicts:
	Makefile
	libavcodec/utils.c
	libavformat/avformat.h
	libswscale/swscale_internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-11 04:23:25 +02:00
doc Merge commit '142e76f1055de5dde44696e71a5f63f2cb11dedf' 2011-07-11 04:23:25 +02:00
ffpresets presets: forgotten libvpx presets 2011-06-21 17:52:16 +02:00
libavcodec Merge commit '142e76f1055de5dde44696e71a5f63f2cb11dedf' 2011-07-11 04:23:25 +02:00
libavdevice Merge remote-tracking branch 'qatar/master' 2011-07-10 04:28:50 +02:00
libavfilter Merge commit '142e76f1055de5dde44696e71a5f63f2cb11dedf' 2011-07-11 04:23:25 +02:00
libavformat Merge commit '142e76f1055de5dde44696e71a5f63f2cb11dedf' 2011-07-11 04:23:25 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2011-07-09 02:06:40 +02:00
libpostproc Merge remote-tracking branch 'qatar/master' 2011-07-06 23:57:11 +02:00
libswscale Merge commit '142e76f1055de5dde44696e71a5f63f2cb11dedf' 2011-07-11 04:23:25 +02:00
mt-work Update todo 2011-06-12 18:01:29 +02:00
tests Merge commit '142e76f1055de5dde44696e71a5f63f2cb11dedf' 2011-07-11 04:23:25 +02:00
tools showfiltfmts: use av_get_pix_fmt_name() 2011-06-07 12:44:51 +02:00
.gitignore Merge remote-tracking branch 'qatar/master' 2011-07-06 23:57:11 +02:00
Changelog lavdev: add openal input device 2011-06-27 15:26:14 +02:00
cmdutils.c Merge commit '142e76f1055de5dde44696e71a5f63f2cb11dedf' 2011-07-11 04:23:25 +02:00
cmdutils.h Make all option parsing functions match the function pointer type through which they are called. 2011-06-30 11:49:48 -04:00
cmdutils_common_opts.h Make all option parsing functions match the function pointer type through which they are called. 2011-06-30 11:49:48 -04:00
common.mak Merge commit '142e76f1055de5dde44696e71a5f63f2cb11dedf' 2011-07-11 04:23:25 +02:00
configure Merge commit '142e76f1055de5dde44696e71a5f63f2cb11dedf' 2011-07-11 04:23:25 +02:00
COPYING.GPLv2
COPYING.GPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
COPYING.LGPLv2.1
COPYING.LGPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
CREDITS Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
Doxyfile Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
ffmpeg.c Merge remote-tracking branch 'qatar/master' 2011-07-09 02:06:40 +02:00
ffplay.c Hint why SDL_Init() may have failed. 2011-07-10 21:11:37 +02:00
ffprobe.c Merge commit '142e76f1055de5dde44696e71a5f63f2cb11dedf' 2011-07-11 04:23:25 +02:00
ffserver.c Merge commit '142e76f1055de5dde44696e71a5f63f2cb11dedf' 2011-07-11 04:23:25 +02:00
ffserver.h
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
LICENSE cosmetics: fix dashed line length after 070c5d0 2011-03-28 09:53:40 +02:00
MAINTAINERS MAINTAINERS: add a "Releases" section 2011-06-24 11:15:26 +02:00
Makefile Merge commit '142e76f1055de5dde44696e71a5f63f2cb11dedf' 2011-07-11 04:23:25 +02:00
README cosmetics: fix dashed line length after 070c5d0 2011-03-28 09:53:40 +02:00
RELEASE make the RELEASE file say git and not 0.7 2011-07-09 00:28:16 +02:00
subdir.mak Merge commit '142e76f1055de5dde44696e71a5f63f2cb11dedf' 2011-07-11 04:23:25 +02:00
version.sh Merge remote-tracking branch 'qatar/master' 2011-06-20 04:07:34 +02:00

README 

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.