generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
30,788 Commits 24 Branches 241 Tags
Go to file
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
Michael Niedermayer c137fdd778 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  swscale: remove misplaced comment.
  ffmpeg: fix streaming to ffserver.
  swscale: split out RGB48 output functions from yuv2packed[12X]_c().
  build: move vpath directives to main Makefile
  swscale: fix JPEG-range YUV scaling artifacts.
  build: move ALLFFLIBS to a more logical place
  ARM: factor some repetitive code into macros
  Fix SVQ3 after adding 4:4:4 H.264 support
  H.264: fix CODEC_FLAG_GRAY
  4:4:4 H.264 decoding support
  ac3enc: fix allocation of floating point samples.

Conflicts:
	ffmpeg.c
	libavcodec/dsputil_template.c
	libavcodec/h264.c
	libavcodec/mpegvideo.c
	libavcodec/snow.c
	libswscale/swscale.c
	libswscale/swscale_internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-15 02:15:25 +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-15 02:15:25 +02:00
libavdevice
oss,sndio: simplify by using FFMIN.
2011-06-09 22:53:17 +02:00
libavfilter
vf_mp: Fix large memleak.
2011-06-15 01:36:12 +02:00
libavformat
Merge remote-tracking branch 'qatar/master'
2011-06-14 04:56:26 +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-15 02:15:25 +02:00
mt-work
Update todo
2011-06-12 18:01:29 +02:00
tests
swscale: fix JPEG-range YUV scaling artifacts.
2011-06-14 09:46:49 -04: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
Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1.
2009-06-05 09:51:31 +00:00
COPYING.GPLv3
Add configure option to upgrade (L)GPL to version 3.
2009-06-05 11:04:03 +00:00
COPYING.LGPLv2.1
Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1.
2009-06-05 09:51:31 +00:00
COPYING.LGPLv3
Add configure option to upgrade (L)GPL to version 3.
2009-06-05 11:04:03 +00:00
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: fix streaming to ffserver.
2011-06-14 15:59:15 -04: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
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
Revert "partially rename FFmpeg to Libav"
2011-03-17 17:26:45 +01:00
MAINTAINERS
add MicroDVD muxer and demuxer
2011-04-04 01:29:40 +02:00
Makefile
Merge remote-tracking branch 'qatar/master'
2011-06-15 02:15:25 +02:00
README
Revert "partially rename FFmpeg to Libav"
2011-03-17 17:26:45 +01:00
subdir.mak
Merge remote-tracking branch 'qatar/master'
2011-06-04 06:35:17 +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.
Description
No description provided
Readme 173 MiB
Languages
C 92.1%
Assembly 6%
Makefile 1.2%
C++ 0.3%
Objective-C 0.2%
Other 0.1%