1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Go to file
Michael Niedermayer d8fb209a7f Merge commit '058d5f2feb730846f22c1812e433f92f670ad751'
* commit '058d5f2feb730846f22c1812e433f92f670ad751':
  mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_picture_header()

Conflicts:
	libavcodec/mjpegenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06 11:16:05 +01:00
compat
doc lavfi: add aeval filter 2013-12-06 10:57:26 +01:00
libavcodec Merge commit '058d5f2feb730846f22c1812e433f92f670ad751' 2013-12-06 11:16:05 +01:00
libavdevice Add Windows resource file support for shared libraries 2013-12-05 23:42:07 +01:00
libavfilter lavfi: rename asrc_aevalsrc.c to aeval.c 2013-12-06 10:57:28 +01:00
libavformat Add Windows resource file support for shared libraries 2013-12-05 23:42:07 +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 Merge commit '58a868968df445068a143f327ced03b6a02baf0d' 2013-12-06 04:03:05 +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 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.