1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Go to file
Michael Niedermayer ff584803b7 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  rtp: Packetization of JPEG (RFC 2435)
  smoothstreamingenc: Copy the SAR on the AVStreams as well

Conflicts:
	Changelog
	libavformat/rtpenc.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-24 13:54:24 +02:00
compat compat/vsnprintf: return number of bytes required on truncation. 2012-09-15 19:46:54 -04:00
doc WebVTT demuxer and decoder. 2012-09-23 15:24:08 +02:00
libavcodec lavc/roqvideodec: fix error message 2012-09-24 12:02:38 +02:00
libavdevice lavd/lavfi: push frames until the last sink is EOF 2012-09-20 12:13:17 +02:00
libavfilter lavfi: add asendcmd and sendcmd filters 2012-09-23 00:50:06 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-09-24 13:54:24 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2012-09-14 14:13:38 +02:00
libavutil ppc/cpu: make linux 32bit specific altivec detection depend on __linux__ 2012-09-24 13:41:48 +02:00
libpostproc postproc: Fix unprotected inline asm 2012-09-11 20:12:14 +02:00
libswresample swr/resample: mark mm_flags as potentially unused 2012-09-13 19:31:02 +02:00
libswscale swscale: change assert() to av_assert() 2012-09-18 05:19:11 +02:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests tests/fate-ffprobe: fix typo in metadata comment 2012-09-24 10:32:52 +02:00
tools Remove mt-work directory 2012-09-15 15:40:36 -04:00
.gitignore gitignore: codec_names.h is no more 2012-09-07 14:59:01 +02:00
arch.mak Optimization of AMR NB and WB decoders for MIPS 2012-06-11 21:12:39 +02:00
Changelog Merge remote-tracking branch 'qatar/master' 2012-09-24 13:54:24 +02:00
cmdutils_common_opts.h cmdutils: add -layouts option. 2012-08-28 15:09:49 +02:00
cmdutils.c cmdutils: sort codec lists. 2012-09-23 21:05:29 +02:00
cmdutils.h Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5' 2012-08-31 13:01:30 +02:00
common.mak Merge remote-tracking branch 'qatar/master' 2012-09-16 14:55:00 +02:00
configure configure: enable runtime cpu detect by default. 2012-09-24 13:17:29 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1 cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
COPYING.LGPLv3
CREDITS Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
Doxyfile Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
ffmpeg_filter.c Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521' 2012-09-18 14:45:44 +02:00
ffmpeg_opt.c ffmpeg: fix 10l (use of uninitilaized variable) 2012-09-22 22:09:41 +02:00
ffmpeg.c ffmpeg: complete mov/mp4 based timebase hack with "f4v" format. 2012-09-21 17:27:57 +02:00
ffmpeg.h ffmpeg: use PTS from the AVSubtitle structure. 2012-09-15 16:14:33 +02:00
ffplay.c ffplay: dont wait 100ms if data is not yet ready 2012-09-16 19:07:28 +02:00
ffprobe.c ffprobe: reindent after the previous commit 2012-09-22 09:34:56 +02:00
ffserver.c ffserver: fix typo in log message 2012-09-18 21:11:06 -05:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
library.mak Merge commit '581281e242609a222233a2e5538b89dfb88fb18e' 2012-09-20 03:20:29 +02:00
LICENSE LICENSE: correct incorrect claims on *GPL incompatibility 2012-08-16 04:47:18 +02:00
MAINTAINERS Add CPiA video decoder 2012-08-31 00:24:11 +02:00
Makefile Makefile: remove old codec_names.h on distclean 2012-09-07 14:59:01 +02:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE RELEASE: update, seem this has been forgotten 2012-07-01 21:21:07 +02:00
version.sh version.sh: handle shallow clones and snapshots. 2011-07-22 10:43:59 +02:00

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.