RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-19 22:10:34 +00:00
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
30,663 Commits 37 Branches 400 Tags 241 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
f9ecb849ef
Go to file
Michael Niedermayer f9ecb849ef Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  crypto: Use av_freep instead of av_free
  lavf: don't try to free private options if priv_data is NULL.
  swscale: fix types of assembly arguments.
  swscale: move two macros that are only used once into caller.
  swscale: remove unused function.
  options: Add missing braces around struct initializer.
  mov: Remove leftover crufty debug statement with references to a local file.
  dvbsubdec: Fix compilation of debug code.
  Remove all uses of now deprecated metadata functions.
  Move metadata API from lavf to lavu.

Conflicts:
	doc/APIchanges
	libavformat/aiffdec.c
	libavformat/asfdec.c
	libavformat/avformat.h
	libavformat/avidec.c
	libavformat/cafdec.c
	libavformat/matroskaenc.c
	libavformat/mov.c
	libavformat/mp3enc.c
	libavformat/wtv.c
	libavutil/avutil.h
	libavutil/internal.h
	libswscale/swscale.c
	libswscale/x86/swscale_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-09 04:47:19 +02:00
doc Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +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-09 04:47:19 +02:00
libavdevice v4l2: set default standard to NULL 2011-06-07 13:37:55 +02:00
libavfilter lavfi: handle NULL lists in avfilter_make_format_list 2011-06-08 18:50:07 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +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-09 04:47:19 +02:00
mt-work Merge remote-tracking branch 'ffmpeg-mt/master' 2011-05-31 03:10:35 +02:00
tests Merge remote-tracking branch 'qatar/master' 2011-06-03 05:19:30 +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' into master 2011-05-29 03:34:35 +02:00
cmdutils_common_opts.h cmdutils: remove OPT_FUNC2 2011-05-28 18:23:05 +02:00
cmdutils.c cmdutils: remove unnecessary OPT_DUMMY implementation 2011-06-05 13:21:06 +02:00
cmdutils.h cmdutils: remove unnecessary OPT_DUMMY implementation 2011-06-05 13:21:06 +02:00
common.mak Revert "build: remove empty $(OBJS) target" 2011-06-08 23:44:18 +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-09 04:47:19 +02:00
ffplay.c Merge remote-tracking branch 'qatar/master' 2011-06-08 05:25:28 +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 multiple inclusion guard cleanup 2011-05-21 13:48:10 +02:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
LICENSE
MAINTAINERS add MicroDVD muxer and demuxer 2011-04-04 01:29:40 +02:00
Makefile Makefile: critical build fix after the merge. make fate passed locally due to ffmpeg/ffmpeg_g being there from before 2011-06-07 04:43:03 +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.