FFmpeg git repo
Go to file
Michael Niedermayer fd601ba6b1 Merge commit '5c08ae4f37281441188447cd04dcaf7cd7ce031f'
* commit '5c08ae4f37281441188447cd04dcaf7cd7ce031f':
  segment: Add an option to prepend a string to the list entries

Conflicts:
	doc/muxers.texi
	libavformat/segment.c

See: 5e278c19c7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-29 15:57:43 +02:00
compat
doc Merge commit '5c08ae4f37281441188447cd04dcaf7cd7ce031f' 2014-04-29 15:57:43 +02:00
libavcodec avcodec/mpegvideo: fix null pointer dereference 2014-04-29 14:52:12 +02:00
libavdevice Fix convertion typos 2014-04-29 00:09:08 +02:00
libavfilter avfilter/graphdump: Fix pointer to local outside scope 2014-04-28 04:01:50 +02:00
libavformat Merge commit '5c08ae4f37281441188447cd04dcaf7cd7ce031f' 2014-04-29 15:57:43 +02:00
libavresample Merge commit 'a24a252709dd38f12aa4929ce4981f87091a5113' 2014-04-25 01:19:27 +02:00
libavutil avutil/log: fix memleak from 669a09fb37 2014-04-29 03:13:51 +02:00
libpostproc Fix libpostproc compilation with !HAVE_6REGS. 2014-04-24 17:50:02 +02:00
libswresample Fix convertion typos 2014-04-29 00:09:08 +02:00
libswscale Fix teh typos 2014-04-27 15:16:13 +02:00
presets
tests avformat/utils: prevent r frame rate from being set larger than 1/tb 2014-04-28 15:49:51 +02:00
tools tools/uncoded_frame: fix audio codec generation 2014-03-29 09:25:14 +01:00
.gitignore examples: rename avcodec.c to decoding_encoding.c 2014-04-23 10:32:42 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Changelog Merge commit '35177ba77ff60a8b8839783f57e44bcc4214507a' 2014-04-29 01:22:22 +02:00
INSTALL
LICENSE
MAINTAINERS MAINTAINERS: Add myself as FIC maintainer 2014-04-21 21:27:32 -04:00
Makefile Merge commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a' 2014-04-29 01:47:53 +02:00
README
RELEASE Prepare for 11_alpha1 Release 2014-03-13 08:24:11 -04:00
arch.mak Merge commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14' 2014-04-07 02:15:18 +02:00
cmdutils.c cmdutils: preserve unchanged log flags when setting AV_LOG_SKIP_REPEATED 2014-04-26 19:21:59 +02:00
cmdutils.h Merge commit '85698be461c07be10d873dd34348bcfe9ffc56e0' 2014-03-29 14:33:39 +01:00
cmdutils_common_opts.h
cmdutils_opencl.c
common.mak lavd: Add QTKit input device. 2014-03-30 20:45:07 +02:00
configure Merge commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a' 2014-04-29 01:47:53 +02:00
ffmpeg.c ffmpeg: print an error at the end if conversion failed 2014-04-29 00:09:08 +02:00
ffmpeg.h Merge commit '35177ba77ff60a8b8839783f57e44bcc4214507a' 2014-04-29 01:22:22 +02:00
ffmpeg_dxva2.c ffmpeg_dxva2: fix mixing of declarations and statements 2014-04-29 01:54:42 +02:00
ffmpeg_filter.c ffmpeg_filter: make *jpeg_formats static const 2014-04-28 00:22:38 +02:00
ffmpeg_opt.c Merge commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a' 2014-04-29 01:47:53 +02:00
ffmpeg_vdpau.c
ffplay.c avformat: add av_format_inject_global_side_data(), and disable it by default 2014-04-15 02:37:40 +02:00
ffprobe.c ffprobe: fix scaling of vali in value_string() in case -prefix is selected 2014-04-23 10:32:42 +02:00
ffserver.c ffserver: do not ignore lseek() return 2014-04-29 01:08:06 -04:00
library.mak
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.