ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-25 15:50:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,152 Commits 37 Branches 398 Tags 539 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
bfb1f44d24
Go to file
Michael Niedermayer bfb1f44d24 Merge commit 'a639ea7f4bc44bf6bfa452675558a342924a66a9' 
* commit 'a639ea7f4bc44bf6bfa452675558a342924a66a9':
  escape124: use the AVFrame API properly.
  qtrle: use the AVFrame API properly.
  cljr: use the AVFrame API properly.
  cinepak: use the AVFrame API properly.

Conflicts:
	libavcodec/cinepak.c
	libavcodec/cljr.c
	libavcodec/qtrle.c

See: 80e9e63c libavcodec/cinepak.c
See: 71c378984b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-17 00:51:01 +01:00
compat Merge remote-tracking branch 'qatar/master' 2013-11-07 23:39:31 +01:00
doc Merge commit '5b9c3b4505206143d85398c1410949319fa1180f' 2013-11-16 23:54:10 +01:00
libavcodec Merge commit 'a639ea7f4bc44bf6bfa452675558a342924a66a9' 2013-11-17 00:51:01 +01:00
libavdevice lavd/xv: free resources on errors 2013-11-15 09:56:58 +01:00
libavfilter Merge commit '5b9c3b4505206143d85398c1410949319fa1180f' 2013-11-16 23:54:10 +01:00
libavformat Merge commit '5b9c3b4505206143d85398c1410949319fa1180f' 2013-11-16 23:54:10 +01:00
libavresample Merge commit '211ca69b13eb0a127a9ef7e70ddaccdab125d1c5' 2013-10-28 09:59:53 +01:00
libavutil Merge commit 'cce3e0a49f0dd030262c28d9c53de0bd2fd909c4' 2013-11-14 15:04:04 +01:00
libpostproc postprocess_template: put rsp on the clobber list to prevent gcc from using it in "q" 2013-06-16 18:21:39 +02:00
libswresample lswr: fix assert failure on unknown layouts. 2013-11-03 10:30:37 +01:00
libswscale swscale/swscale_unscaled: fix right column handling in planarCopyWrapper 2013-11-16 21:15:05 +01:00
presets
tests Merge remote-tracking branch 'qatar/master' 2013-11-15 15:24:36 +01:00
tools tools/probetest: also print the time the probe functions needed 2013-11-08 22:33:52 +01:00
.gitignore doc/examples: rename demuxing to demuxing_decoding. 2013-11-04 12:53:06 +01:00
arch.mak
Changelog lavc: VP9 decoder 2013-11-15 10:16:28 +01:00
cmdutils_common_opts.h cmdutils: add -colors option 2013-10-27 09:18:45 +01:00
cmdutils.c cmdutils: fix expected signature for show_colors() function 2013-10-28 09:41:25 +01:00
cmdutils.h cmdutils: fix expected signature for show_colors() function 2013-10-28 09:41:25 +01:00
common.mak Merge commit 'e8fcdebb17fc59375fd9fc6c0a02a1d2e6d9fb23' 2013-11-15 12:19:45 +01:00
configure lavc: VP9 decoder 2013-11-15 10:16:28 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c ffmpeg_filter: Fix non jpeg yuv in jpeg support 2013-10-27 17:41:06 +01:00
ffmpeg_opt.c ffmpeg: Do not fill gap before the first decodable frame on single stream input files unless the user explicitly requests it. 2013-11-16 14:27:29 +01:00
ffmpeg.c Merge commit '5b9c3b4505206143d85398c1410949319fa1180f' 2013-11-16 23:54:10 +01:00
ffmpeg.h ffmpeg: Do not fill gap before the first decodable frame on single stream input files unless the user explicitly requests it. 2013-11-16 14:27:29 +01:00
ffplay.c Merge commit '5b9c3b4505206143d85398c1410949319fa1180f' 2013-11-16 23:54:10 +01:00
ffprobe.c ffprobe: fix consistency checks in parse_read_intervals() 2013-10-21 13:33:06 +02:00
ffserver.c ffserver: strip odd chars from html error messages before sending them back 2013-10-09 00:30:46 +02:00
INSTALL
library.mak build: remove pointless condition 2013-10-29 14:00:29 +00:00
LICENSE libavfilter/vf_noise: relicense to LGPL 2013-10-27 20:29:07 +00:00
MAINTAINERS MAINTAINERS: Add 1.2 back to the maintained releases 2013-11-12 14:33:54 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2013-11-04 01:20:46 +01:00
README
RELEASE Update for 2.0 2013-07-10 02:15:43 +02:00
version.sh

README 

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

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

* Read the documentation in the doc/ directory in git.
  You can also view it online at http://ffmpeg.org/documentation.html

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

* See the LICENSE file.

3) Build and Install
--------------------

* See the INSTALL file.