1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
Go to file
Michael Niedermayer cefabaad3e Merge commit 'e5419709f50593769037ab77d7102f82d9260784'
* commit 'e5419709f50593769037ab77d7102f82d9260784':
  lavc: remove the extended_data workarounds.

Conflicts:
	libavcodec/utils.c

One hunk is not merged as not all codecs are updated yet

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-09 14:32:19 +01:00
compat
doc lavfi: add aeval filter 2013-12-06 10:57:26 +01:00
libavcodec Merge commit 'e5419709f50593769037ab77d7102f82d9260784' 2013-12-09 14:32:19 +01:00
libavdevice lavd/fbdev_enc: add default device 2013-12-06 19:15:47 +01:00
libavfilter configure: Special case libfreetype test 2013-12-08 18:21:46 +01:00
libavformat Revert: flvenc: Don't pretend to support muxing "plain" VP6 2013-12-09 13:18:29 +01:00
libavresample avresample: Include libavutil/avutil.h in version.h 2013-12-06 22:13:20 +01:00
libavutil avutil/opt: Implement av_opt_set_defaults* in O(N) instead of O(N²) time 2013-12-07 14:09:36 +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 swscale/utils: fill xyz tables only when they will be used 2013-12-07 02:04:31 +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
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 common.mak: Less ugly version of the previous windres fix 2013-12-09 02:47:55 +01:00
configure Merge remote-tracking branch 'qatar/master' 2013-12-09 04:47:20 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg_vdpau.c
ffmpeg.c
ffmpeg.h
ffplay.c ffplay: set default window size before starting audio 2013-12-06 19:57:45 +01:00
ffprobe.c
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.