RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-13 02:34:54 +00:00
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
30,503 Commits 37 Branches 400 Tags 238 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
99eb31e263
Go to file
Michael Niedermayer 99eb31e263 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (25 commits)
  Replace custom DEBUG preprocessor trickery by the standard one.
  vorbis: Remove non-compiling debug statement.
  vorbis: Remove pointless DEBUG #ifdef around debug output macros.
  cook: Remove non-compiling debug output.
  Remove pointless #ifdefs around function declarations in a header.
  Replace #ifdef + av_log() combinations by av_dlog().
  Replace custom debug output functions by av_dlog().
  cook: Remove unused debug functions.
  Remove stray extra arguments from av_dlog() invocations.
  targa: fix big-endian build
  v4l2: remove one forgotten use of AVFormatParameters.pix_fmt.
  vfwcap: add a framerate private option.
  v4l2: add a framerate private option.
  libdc1394: add a framerate private option.
  fbdev: add a framerate private option.
  bktr: add a framerate private option.
  oma: check avio_read() return value
  nutdec: remove unused variable
  Remove unused variables
  swscale: allocate larger buffer to handle altivec overreads.
  ...

Conflicts:
	ffmpeg.c
	libavcodec/dca.c
	libavcodec/dirac.c
	libavcodec/error_resilience.c
	libavcodec/h264.c
	libavcodec/mpeg12.c
	libavcodec/mpeg4videodec.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/pthread.c
	libavcodec/rv10.c
	libavcodec/s302m.c
	libavcodec/shorten.c
	libavcodec/truemotion2.c
	libavcodec/utils.c
	libavdevice/dv1394.c
	libavdevice/fbdev.c
	libavdevice/libdc1394.c
	libavdevice/v4l2.c
	libavformat/4xm.c
	libavformat/apetag.c
	libavformat/asfdec.c
	libavformat/avidec.c
	libavformat/mmf.c
	libavformat/mpeg.c
	libavformat/mpegenc.c
	libavformat/mpegts.c
	libavformat/oggdec.c
	libavformat/oggparseogm.c
	libavformat/rl2.c
	libavformat/rmdec.c
	libavformat/rpl.c
	libavformat/rtpdec_latm.c
	libavformat/sauce.c
	libavformat/sol.c
	libswscale/utils.c
	tests/ref/vsynth1/error
	tests/ref/vsynth2/error

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-03 05:19:30 +02:00
doc lavfi: add avfilter_link_free() function 2011-06-03 00:41:32 +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-03 05:19:30 +02:00
libavdevice Merge remote-tracking branch 'qatar/master' 2011-06-03 05:19:30 +02:00
libavfilter lavfi: add avfilter_link_free() function 2011-06-03 00:41:32 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2011-06-03 05:19:30 +02:00
libavutil cpudetect: add av_force_cpu_flags() 2011-06-02 21:03:54 +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 In libswscale, use all lines when converting from 422p to rgb with mmx, improve quality. 2011-06-03 03:46:13 +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 Merge remote branch 'qatar/master' 2011-05-17 04:51:33 +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 OPT_FUNC2 2011-05-28 18:23:05 +02:00
cmdutils.h cmdutils: remove OPT_FUNC2 2011-05-28 18:23:05 +02:00
common.mak Merge remote-tracking branch 'qatar/master' 2011-05-30 01:29:11 +02:00
configure Merge remote-tracking branch 'qatar/master' 2011-06-03 05:19:30 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg.c Merge remote-tracking branch 'qatar/master' 2011-06-03 05:19:30 +02:00
ffplay.c Fix various uninitialized variable warnings 2011-06-02 10:36:56 +02:00
ffprobe.c cmdutils: remove OPT_FUNC2 2011-05-28 18:23:05 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2011-06-03 05:19:30 +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 add MicroDVD muxer and demuxer 2011-04-04 01:29:40 +02:00
Makefile Merge remote-tracking branch 'qatar/master' 2011-05-30 01:29:11 +02:00
README cosmetics: fix dashed line length after 070c5d0 2011-03-28 09:53:40 +02:00
subdir.mak Remove avconfig.h and INCINSTDIRs on uninstall. 2011-05-24 10:09:45 +02:00
version.sh

README 

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.