1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Go to file
Michael Niedermayer 59398c1342 Merge remote-tracking branch 'lukaszmluki/master'
* lukaszmluki/master:
  lavd/fbdev_enc: add default device

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06 20:26:48 +01:00
compat
doc lavfi: add aeval filter 2013-12-06 10:57:26 +01:00
libavcodec avcodec/error_resilience: check that er is supported before attempting to read the status of the previous slice 2013-12-06 16:49:35 +01:00
libavdevice lavd/fbdev_enc: add default device 2013-12-06 19:15:47 +01:00
libavfilter do O(1) instead of O(n) atomic operations in register functions 2013-12-06 15:27:36 +01:00
libavformat lavf/mux: Don't write "encoder" metadata tag when bitexact is requested 2013-12-06 19:33:41 +01:00
libavresample Add Windows resource file support for shared libraries 2013-12-05 23:42:07 +01:00
libavutil Add Windows resource file support for shared libraries 2013-12-05 23:42:07 +01:00
libpostproc Add Windows resource file support for shared libraries 2013-12-05 23:42:07 +01:00
libswresample Add Windows resource file support for shared libraries 2013-12-05 23:42:07 +01:00
libswscale Add Windows resource file support for shared libraries 2013-12-05 23:42:07 +01:00
presets
tests lavf/mux: Don't write "encoder" metadata tag when bitexact is requested 2013-12-06 19:33:41 +01:00
tools
.gitignore Merge commit '3cd612d44789948f72b52944474e0870c5c60964' 2013-12-01 21:18:11 +01:00
arch.mak
Changelog lavfi: add aeval filter 2013-12-06 10:57:26 +01:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak Add Windows resource file support for shared libraries 2013-12-05 23:42:07 +01:00
configure doc: add script to compute texi files dependencies 2013-12-06 10:40:38 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c Merge remote-tracking branch 'qatar/master' 2013-12-04 04:30:46 +01:00
ffmpeg_vdpau.c
ffmpeg.c
ffmpeg.h
ffplay.c
ffprobe.c ffprobe: free shared writer context on exit 2013-12-03 21:27:14 +01:00
ffserver.c
INSTALL
library.mak Add Windows resource file support for shared libraries 2013-12-05 23:42:07 +01:00
LICENSE
MAINTAINERS
Makefile Add Windows resource file support for shared libraries 2013-12-05 23:42:07 +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.