1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-03 05:10:03 +02:00
Go to file
Michael Niedermayer 5de1f7a7bd Merge commit '18e6f087c4a50bede8449ee164778945480be50c'
* commit '18e6f087c4a50bede8449ee164778945480be50c':
  img2: document the options available
  hls: improve options description
  hls: use a meaningful long name
  hls: add start_number option
  h264: check for invalid zeros_left before writing

Conflicts:
	doc/demuxers.texi
	doc/muxers.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-09 13:35:49 +01:00
compat
doc Merge commit '18e6f087c4a50bede8449ee164778945480be50c' 2012-12-09 13:35:49 +01:00
libavcodec Flip zerocodec output. 2012-12-09 10:24:16 +01:00
libavdevice dshow: fix return code when opening device 2012-12-08 21:44:30 +01:00
libavfilter lavfi/setfield: add support to named options and introspection 2012-12-08 18:26:32 +01:00
libavformat Merge commit '18e6f087c4a50bede8449ee164778945480be50c' 2012-12-09 13:35:49 +01:00
libavresample Merge commit 'f5fa03660db16f9d78abc5a626438b4d0b54f563' 2012-11-28 13:27:18 +01:00
libavutil lavu/opt: change the way ranges are printed 2012-12-08 22:18:38 +01:00
libpostproc
libswresample resample: remove disabled debug code 2012-12-06 02:51:26 +01:00
libswscale sws_scale: check input against NULL 2012-12-07 21:50:07 +01:00
presets
tests Flip zerocodec output. 2012-12-09 10:24:16 +01:00
tools
.gitignore Add examples/resampling_audio to .gitignore. 2012-12-06 12:13:01 +01:00
arch.mak Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30' 2012-12-08 14:24:16 +01:00
Changelog tak: demuxer, parser, and decoder 2012-12-07 16:15:02 -05:00
cmdutils_common_opts.h
cmdutils.c Merge commit 'ff953fecffd3b9a616a046723fb9d4690be032a6' 2012-12-05 15:58:07 +01:00
cmdutils.h
common.mak
configure Merge commit '096abfa15052977eed93f0b5e01afd2d47c53c1f' 2012-12-08 14:58:56 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c Merge commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56' 2012-12-06 15:55:47 +01:00
ffmpeg_opt.c ffmpeg: use avformat_seek_file() instead of av_seek_frame(). 2012-12-02 00:06:02 +01:00
ffmpeg.c ffmpeg: small indent fix. 2012-12-04 16:40:11 +01:00
ffmpeg.h
ffplay.c Merge remote-tracking branch 'qatar/master' 2012-11-29 14:22:58 +01:00
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS MAINTAINERS: add myself for my works 2012-12-08 15:18:08 +00:00
Makefile Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30' 2012-12-08 14:24:16 +01: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.