ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-27 00:30:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,806 Commits 37 Branches 398 Tags 548 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
7a02527b05
Go to file
Michael Niedermayer 7a02527b05 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  ac3enc: use correct alignment and length in channel coupling dsp functions.
  ffmpeg: don't abuse a global for passing framerate from input to output
  ffmpeg: don't abuse a global for passing channels from input to output
  ffmpeg: don't abuse a global for passing samplerate from input to output
  ARM: update ff_h264_idct8_add4_neon for 4:4:4 changes
  swscale: use SwsContext for av_log when available
  swscale: Remove HAVE_MMX from files that are only compiled with MMX enabled.
  swscale: Fix compilation with --disable-mmx2.

Conflicts:
	ffmpeg.c
	libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-16 03:53:58 +02:00
doc libavfilter: implement avfilter_fill_frame_from_video_buffer_ref() 2011-06-12 22:46:02 +02:00
ffpresets Merge remote-tracking branch 'qatar/master' 2011-05-18 05:42:42 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2011-06-16 03:53:58 +02:00
libavdevice x11grab: remove a memory allocation and the associated memcpy. 2011-06-12 12:18:05 +02:00
libavfilter vf_mp: Fix large memleak. 2011-06-15 01:36:12 +02:00
libavformat mmsh: fixed printf injection bug in mmsh request 2011-06-16 03:15:21 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2011-06-11 03:51:36 +02:00
libpostproc postprocess: Remove test for impossible condition (was: Re: postprocess.c: replace check for p==NULL with *p==0) 2011-06-02 14:43:14 +02:00
libswscale Merge remote-tracking branch 'qatar/master' 2011-06-16 03:53:58 +02:00
mt-work Update todo 2011-06-12 18:01:29 +02:00
tests Merge remote-tracking branch 'qatar/master' 2011-06-16 03:53:58 +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-05-20 05:48:22 +02:00
Changelog Merge remote-tracking branch 'qatar/master' 2011-06-14 04:56:26 +02:00
cmdutils_common_opts.h cmdutils: remove OPT_FUNC2 2011-05-28 18:23:05 +02:00
cmdutils.c Merge remote-tracking branch 'qatar/master' 2011-06-13 04:39:58 +02:00
cmdutils.h cmdutils: remove unnecessary OPT_DUMMY implementation 2011-06-05 13:21:06 +02:00
common.mak Merge remote-tracking branch 'qatar/master' 2011-06-15 02:15:25 +02:00
configure Merge remote-tracking branch 'qatar/master' 2011-06-08 05:25:28 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg.c Merge remote-tracking branch 'qatar/master' 2011-06-16 03:53:58 +02:00
ffplay.c avfiltergraph: make the AVFilterInOut alloc/free API public 2011-06-12 22:46:02 +02:00
ffprobe.c Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +02:00
ffserver.h
INSTALL
LICENSE
MAINTAINERS
Makefile Merge remote-tracking branch 'qatar/master' 2011-06-15 02:15:25 +02:00
README
subdir.mak Merge remote-tracking branch 'qatar/master' 2011-06-04 06:35:17 +02:00
version.sh

README 

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.