1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Go to file
Michael Niedermayer d0bf3bf1ff Merge remote-tracking branch 'qatar/master'
* qatar/master:
  lavf: Detect discontinuities in timestamps for framerate/analyzeduration calculation
  lavf: Initialize the stream info timestamps in avformat_new_stream
  id3v2: Match PIC mimetype/format case-insensitively
  configure: Rename check_asm() to more fitting check_inline_asm()
  fate: Only test enabled filters
  avresample: De-doxygenize some comments where Doxygen is not appropriate
  rtmp: split chunk_size var into in_chunk_size and out_chunk_size
  rtmp: Factorize the code by adding find_tracked_method

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-12 13:43:03 +02:00
compat
doc Merge remote-tracking branch 'qatar/master' 2012-08-11 15:01:45 +02:00
libavcodec sgidec: fix error free end detection. 2012-08-12 05:32:07 +02:00
libavdevice lavd/x11grab: deprecate "nomouse" specification in filename 2012-08-08 23:43:37 +02:00
libavfilter Merge remote-tracking branch 'qatar/master' 2012-08-10 16:25:23 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-08-12 13:43:03 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2012-08-12 13:43:03 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2012-08-11 15:01:45 +02:00
libpostproc Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00
libswresample Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00
libswscale Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00
mt-work
presets
tests Merge remote-tracking branch 'qatar/master' 2012-08-12 13:43:03 +02:00
tools
.gitignore Merge remote-tracking branch 'qatar/master' 2012-08-09 00:51:02 +02:00
arch.mak
Changelog lavfi: add asetpts audio filter 2012-08-09 01:03:05 +02:00
cmdutils_common_opts.h
cmdutils.c cmdutils: show options in show_help_children only if the context has options 2012-08-10 23:14:44 +02:00
cmdutils.h
common.mak checkheaders: Rename HEADEROBJS to HOBJS 2012-08-09 05:02:45 +02:00
configure Merge remote-tracking branch 'qatar/master' 2012-08-12 13:43:03 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg_filter.c Merge remote-tracking branch 'qatar/master' 2012-08-09 00:51:02 +02:00
ffmpeg_opt.c ffmpeg: dont auto match videostreams with attachment pics. 2012-08-10 17:23:18 +02:00
ffmpeg.c ffmpeg: Do not discard slightly invalid timestamps. 2012-08-12 01:22:48 +02:00
ffmpeg.h Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00
ffplay.c
ffprobe.c Remove "Error parsing options string [...]" messages. 2012-08-09 08:11:00 +02:00
ffserver.c
INSTALL
library.mak Merge remote-tracking branch 'qatar/master' 2012-08-09 00:51:02 +02:00
LICENSE
MAINTAINERS
Makefile Merge remote-tracking branch 'qatar/master' 2012-08-10 04:46:13 +02:00
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.