FFmpeg git repo
Go to file
Michael Niedermayer c942e8b1d7 Merge commit '07584eaf4a95db3f11d3bc411f9786932829e82b'
* commit '07584eaf4a95db3f11d3bc411f9786932829e82b':
  mpegts: check substreams before discarding
  Add a smooth streaming segmenter muxer
  file: Add an avoption for disabling truncating existing files on open
  img2dec: always close AVIOContexts
  rtpdec_jpeg: Error out on other unsupported type values as well
  rtpdec_jpeg: Disallow using the reserved q values
  rtpdec_jpeg: Fold the default qtables case into an existing if statement
  rtpdec_jpeg: Store and reuse old qtables for q values 128-254
  rtpdec_jpeg: Simplify the calculation of the number of qtables
  rtpdec_jpeg: Add more comments about the fields in the SOF0 section
  rtpdec_jpeg: Clarify where the subsampling magic numbers come from
  rtpdec_jpeg: Don't use a bitstream writer for the EOI marker
  rtpdec_jpeg: Don't needlessly use a bitstream writer for the header
  rtpdec_jpeg: Simplify writing of the jpeg header
  rtpdec_jpeg: Merge two if statements
  rtpdec_jpeg: Write the DHT section properly

Conflicts:
	libavformat/Makefile
	libavformat/allformats.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-13 15:22:16 +02:00
compat
doc ffprobe: print start_pts and duration_ts stream information 2012-09-12 10:22:29 +02:00
libavcodec vc1dec: export adv profile color format indication 2012-09-12 21:12:18 +02:00
libavdevice lavd/lavfi: apply stylistic fixes to the options help fields 2012-09-11 22:56:35 +02:00
libavfilter lavfi/aresample: set buffer properties after copy. 2012-09-13 12:05:19 +02:00
libavformat Merge commit '07584eaf4a95db3f11d3bc411f9786932829e82b' 2012-09-13 15:22:16 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2012-09-09 13:27:42 +02:00
libavutil FATE/bprint: Convert a VLA to a normal array 2012-09-12 05:22:46 +02:00
libpostproc postproc: Fix unprotected inline asm 2012-09-11 20:12:14 +02:00
libswresample swr: add av_cold to init/free functions 2012-09-09 02:26:20 +02:00
libswscale x86/swscale: use unsigned to build SIMD values to avoid signed overflow 2012-09-11 03:02:51 +02:00
mt-work
presets
tests Merge remote-tracking branch 'qatar/master' 2012-09-10 14:06:20 +02:00
tools
.gitignore
arch.mak
Changelog Merge commit '07584eaf4a95db3f11d3bc411f9786932829e82b' 2012-09-13 15:22:16 +02:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure configure: try to support clang on netbsd 2012-09-12 19:37:29 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg_filter.c ffmpeg_filter: fix unsafe snprintf() usage 2012-09-09 14:11:03 +02:00
ffmpeg_opt.c
ffmpeg.c ffmpeg: Only include unistd.h if it exists 2012-09-11 22:59:43 +02:00
ffmpeg.h
ffplay.c ffplay: increase sample array buffer 2012-09-11 22:15:38 +02:00
ffprobe.c ffprobe: print start_pts and duration_ts stream information 2012-09-12 10:22:29 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2012-09-12 11:46:47 +02:00
INSTALL
library.mak
LICENSE
MAINTAINERS
Makefile
README
RELEASE
version.sh

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.