ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-20 21:36:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
36,891 Commits 36 Branches 398 Tags 544 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
67f5650a78
Go to file
Michael Niedermayer 67f5650a78 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  rv34: add NEON rv34_idct_add
  rv34: 1-pass inter MB reconstruction
  add SMJPEG muxer
  avformat: split out common SMJPEG code
  pictordec: Use bytestream2 functions
  avconv: use avcodec_encode_audio2()
  pcmenc: use AVCodec.encode2()
  avcodec: bump minor version and add APIChanges for the new audio encoding API
  avcodec: Add avcodec_encode_audio2() as replacement for avcodec_encode_audio()
  avcodec: add a public function, avcodec_fill_audio_frame().
  rv34: Intra 16x16 handling
  rv34: Inter/intra MB code split

Conflicts:
	Changelog
	libavcodec/avcodec.h
	libavcodec/pictordec.c
	libavcodec/utils.c
	libavcodec/version.h
	libavcodec/x86/rv34dsp.asm
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-17 02:37:30 +01:00
doc Merge remote-tracking branch 'qatar/master' 2012-01-17 02:37:30 +01:00
ffpresets Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2012-01-17 02:37:30 +01:00
libavdevice Revert "v4l2: poll the file descriptor" 2012-01-11 14:57:56 +01:00
libavfilter lavfi/rgbtestsrc: make alpha plane opaque 2012-01-15 14:49:30 +01:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-01-17 02:37:30 +01:00
libavutil lavu: add 2.1 channel layout. 2012-01-16 17:38:23 +01:00
libpostproc Merge remote-tracking branch 'qatar/master' 2012-01-05 02:03:12 +01:00
libswresample libswresample: introduce int swr_set_compensation() instead of void swr_compensate() 2012-01-09 04:16:06 +01:00
libswscale Merge remote-tracking branch 'qatar/master' 2012-01-15 01:16:54 +01:00
mt-work Update todo 2011-06-12 18:01:29 +02:00
presets Remove redundant libx264 preset files 2011-10-22 01:32:10 +02:00
tests dpxenc: Dont store lavc indent when bitexact is set. 2012-01-17 01:37:59 +01:00
tools lavfi-showfiltfmts: fix typo that segfaulted haiku. 2012-01-15 19:46:55 +01:00
.gitignore doc: fate: Support building a plain text version 2011-12-20 16:05:01 +01:00
avconv.c Merge remote-tracking branch 'qatar/master' 2012-01-17 02:37:30 +01:00
Changelog Merge remote-tracking branch 'qatar/master' 2012-01-17 02:37:30 +01:00
cmdutils_common_opts.h ff*: add -max_alloc command line option 2011-12-25 18:55:43 +01:00
cmdutils.c Merge remote-tracking branch 'qatar/master' 2012-01-12 01:10:32 +01:00
cmdutils.h cmdutils: make this_year extern, so it can be referenced from other .o files 2012-01-07 11:02:13 +01:00
common.mak Add coverage support. 2011-12-05 20:04:48 +01:00
configure configure: provide libavfilter/version.h header to get_version() 2012-01-14 07:44:43 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile Merge remote-tracking branch 'qatar/master' 2011-12-26 04:10:47 +01:00
ffmpeg.c Merge remote-tracking branch 'qatar/master' 2012-01-17 02:37:30 +01:00
ffplay.c ffplay: mark i variable in toggle_full_screen() as unused 2012-01-15 14:51:59 +01:00
ffprobe.c Merge remote-tracking branch 'qatar/master' 2012-01-13 01:29:48 +01:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2012-01-13 01:29:48 +01:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
library.mak Merge remote-tracking branch 'qatar/master' 2011-12-18 03:04:44 +01:00
LICENSE libaac+ support 2011-09-26 02:28:21 +02:00
MAINTAINERS MAINTAINERS: update release maintainers 2012-01-02 16:01:33 +01:00
Makefile Makefile: fix path to ffprobe.xsd 2011-12-27 22:29:40 +01:00
README
RELEASE Merge remote-tracking branch 'qatar/master' 2012-01-12 01:10:32 +01:00
version.sh version.sh: handle shallow clones and snapshots. 2011-07-22 10:43:59 +02:00

README 

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.