RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-30 03:13:18 +00:00
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
29,051 Commits 37 Branches 400 Tags 262 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
4727ec3c0e
Go to file
Michael Niedermayer 4727ec3c0e Merge remote branch 'qatar/master' 
* qatar/master:
Not pulled due to wrong author, according to carl:  Add unconditional return statement to yuva420_rgb32_MMX() / yuva420_bgr32_MMX().
  Fix compilation of timefilter test program.
  Add support for AMR-WB encoding via libvo-amrwbenc
  Add an AAC encoder by using the libvo-aacenc library
  g722: Return 8 bits per sample for g722 in av_get_bits_per_sample

Conflicts:
	Changelog

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-12 03:48:21 +02:00
doc Merge remote branch 'qatar/master' 2011-04-12 03:48:21 +02:00
ffpresets Update qmin/qmax values for libx264 presets 2011-02-08 15:59:30 -08:00
libavcodec Merge remote branch 'qatar/master' 2011-04-12 03:48:21 +02:00
libavdevice Revert "fbdev: simplify logic in fbdev_read_packet()" 2011-04-11 00:37:52 +02:00
libavfilter vsrc_buffer.h: add file doxy 2011-04-11 11:29:35 +02:00
libavformat Merge remote branch 'qatar/master' 2011-04-12 03:48:21 +02:00
libavutil Merge remote branch 'qatar/master' 2011-04-11 04:08:08 +02:00
libpostproc Merge remote-tracking branch 'newdev/master' 2011-03-19 20:05:11 +01:00
libswscale Add unconditional return statement to yuva420_rgb32_MMX() / yuva420_bgr32_MMX(). 2011-04-11 14:18:48 +02:00
mt-work Merge remote-tracking branch 'ffmpeg-mt/master' 2011-03-30 02:58:38 +02:00
tests Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
tools patcheck: warn about assert usage 2011-03-18 18:49:36 +01:00
.gitignore
Changelog Merge remote branch 'qatar/master' 2011-04-12 03:48:21 +02:00
cmdutils_common_opts.h
cmdutils.c avio: deprecate av_protocol_next(). 2011-04-08 17:48:53 +02:00
cmdutils.h cmdutils: remove list_fmts(), simplify 2011-03-26 14:40:30 +01:00
common.mak Merge remote-tracking branch 'newdev/master' 2011-04-01 02:58:15 +02:00
configure Merge remote branch 'qatar/master' 2011-04-12 03:48:21 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
Doxyfile Merge remote-tracking branch 'newdev/master' 2011-03-19 20:05:11 +01:00
ffmpeg.c ffmpeg: rename configure_filters() to configure_video_filters() 2011-04-11 00:14:55 +02:00
ffplay.c ffplay: fix weird brace placement in video_image_display() 2011-04-12 01:37:00 +02:00
ffprobe.c ffprobe: provide format parameters to av_open_input_file() 2011-03-26 14:41:51 +01:00
ffserver.c Merge remote branch 'qatar/master' 2011-04-09 03:17:07 +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 Drop checkheaders from check, its useless 2011-04-06 23:21:44 +02:00
README cosmetics: fix dashed line length after 070c5d0 2011-03-28 09:53:40 +02:00
subdir.mak Revert "Remove support for stripping executables" 2011-04-01 00:24:12 +02:00
version.sh Merge remote-tracking branch 'newdev/master' 2011-03-19 20:05:11 +01:00

README 

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.