1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-03 05:10:03 +02:00
Go to file
Michael Niedermayer de7c95d551 Merge commit '7941159df6aad2d219e2a7184489be7a735dd944'
* commit '7941159df6aad2d219e2a7184489be7a735dd944':
  rtpdec/enc: Remove outdated/useless/misleading comments
  rtpdec: Improve some comments
  rtpdec: Remove unused context variables
  rtpdec: Limit writing to the buffer size
  svq1: Fix building with -DDEBUG
  svq1: return meaningful error codes.

Conflicts:
	libavcodec/svq1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-13 12:06:19 +01:00
compat
doc lavfi/select: add support to options 2012-12-13 00:16:30 +01:00
libavcodec Merge commit '998fdcff41bbda8ef13c991743376556f910efa9' 2012-12-13 11:53:15 +01:00
libavdevice
libavfilter lavfi: drop ff_null_start_frame/end_frame/draw_slice. 2012-12-13 03:38:16 +01:00
libavformat Merge commit '7941159df6aad2d219e2a7184489be7a735dd944' 2012-12-13 12:06:19 +01:00
libavresample Merge remote-tracking branch 'qatar/master' 2012-12-12 10:50:21 +01:00
libavutil x86inc: support stack mem allocation and re-alignment in PROLOGUE. 2012-12-12 10:37:52 +01:00
libpostproc doxy: add ref for lavfi, lpp and lsws. 2012-12-11 02:13:43 +01:00
libswresample swr: Add SOX resampler support 2012-12-11 22:04:00 +01:00
libswscale doxy: add ref for lavfi, lpp and lsws. 2012-12-11 02:13:43 +01:00
presets
tests fate: add BRSTM demuxer test 2012-12-11 11:34:47 +00:00
tools
.gitignore
arch.mak
Changelog lavfi: add aselect audio variant of select 2012-12-13 00:10:24 +01:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak Merge remote-tracking branch 'qatar/master' 2012-12-11 08:24:45 +01:00
configure swr: Add SOX resampler support 2012-12-11 22:04:00 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg.c ffmpeg: sub2video: use start and end time. 2012-12-12 15:05:50 +01:00
ffmpeg.h ffmpeg: sub2video: use start and end time. 2012-12-12 15:05:50 +01:00
ffplay.c
ffprobe.c
ffserver.c
INSTALL
library.mak Merge remote-tracking branch 'qatar/master' 2012-12-11 08:24:45 +01:00
LICENSE
MAINTAINERS
Makefile Merge remote-tracking branch 'qatar/master' 2012-12-11 08:24:45 +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.