FFmpeg git repo
Go to file
Michael Niedermayer 2c9fc694f5 Merge commit '09cb75cdeba420d680bcb165a1ef668d8f381fed'
* commit '09cb75cdeba420d680bcb165a1ef668d8f381fed':
  libx264: set frame packing information when relevant information is found

Conflicts:
	libavcodec/libx264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-09 22:04:29 +01:00
compat Merge remote-tracking branch 'qatar/master' 2013-11-24 23:27:32 +01:00
doc Merge commit '7e244c68600f479270e979258e389ed5240885fb' 2013-12-09 21:33:51 +01:00
libavcodec Merge commit '09cb75cdeba420d680bcb165a1ef668d8f381fed' 2013-12-09 22:04:29 +01:00
libavdevice Merge commit 'd64341e498fa46c6cf4c23d408177d7489559654' 2013-12-09 20:52:14 +01:00
libavfilter configure: Special case libfreetype test 2013-12-08 18:21:46 +01:00
libavformat Merge commit 'd64341e498fa46c6cf4c23d408177d7489559654' 2013-12-09 20:52:14 +01:00
libavresample avresample: Include libavutil/avutil.h in version.h 2013-12-06 22:13:20 +01:00
libavutil Merge commit '7e244c68600f479270e979258e389ed5240885fb' 2013-12-09 21:33:51 +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 Merge commit '3cd612d44789948f72b52944474e0870c5c60964' 2013-12-01 21:18:11 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Changelog Merge commit '7e244c68600f479270e979258e389ed5240885fb' 2013-12-09 21:33:51 +01:00
INSTALL
LICENSE
MAINTAINERS
Makefile cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices 2013-12-09 21:21:36 +01:00
README
RELEASE RELEASE: update to 2.1.git 2013-11-29 16:41:42 +01:00
arch.mak
cmdutils.c cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices 2013-12-09 21:21:36 +01:00
cmdutils.h cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices 2013-12-09 21:21:36 +01:00
cmdutils_common_opts.h cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices 2013-12-09 21:21:36 +01:00
cmdutils_opencl.c cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices 2013-12-09 21:21:36 +01:00
common.mak common.mak: Less ugly version of the previous windres fix 2013-12-09 02:47:55 +01:00
configure Merge commit 'd64341e498fa46c6cf4c23d408177d7489559654' 2013-12-09 20:52:14 +01:00
ffmpeg.c ffmpeg: ensure that -fix_sub_duration doesnt create subtitles with zero duration 2013-11-28 21:30:03 +01:00
ffmpeg.h Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea' 2013-11-23 14:46:48 +01:00
ffmpeg_filter.c Merge remote-tracking branch 'qatar/master' 2013-11-24 05:21:19 +01:00
ffmpeg_opt.c Merge remote-tracking branch 'qatar/master' 2013-12-04 04:30:46 +01:00
ffmpeg_vdpau.c Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea' 2013-11-23 14:46:48 +01:00
ffplay.c ffplay: set default window size before starting audio 2013-12-06 19:57:45 +01:00
ffprobe.c ffprobe: free shared writer context on exit 2013-12-03 21:27:14 +01:00
ffserver.c ffserver: print error code description in case of write_header() failure 2013-11-30 14:35:33 +01:00
library.mak Add Windows resource file support for shared libraries 2013-12-05 23:42:07 +01:00
version.sh version.sh: add preprocessing guards 2013-11-30 21:42:03 +01:00

README

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.