1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Go to file
Michael Niedermayer 99b12357f4 Merge commit '3a0576702825423abecb32627c530dbc4c0f73bc'
* commit '3a0576702825423abecb32627c530dbc4c0f73bc':
  h264: store current_sps_id inside the current sps

Conflicts:
	libavcodec/h264.c
	libavcodec/h264_ps.c

The current_sps_id is not removed as it used in security related code.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-14 13:58:02 +01:00
compat
doc Add libx265 encoder 2014-02-12 13:13:17 +00:00
libavcodec Merge commit '3a0576702825423abecb32627c530dbc4c0f73bc' 2014-02-14 13:58:02 +01:00
libavdevice lavd/avdevice: add param to create window buffer message 2014-02-14 05:13:33 +01:00
libavfilter avfilter/curves: support slice threading. 2014-02-13 14:35:10 +01:00
libavformat Merge commit '8a2250344b19a343d830a902dbcf4c0b929ea49b' 2014-02-14 01:51:17 +01:00
libavresample Merge commit '76a75c523cd3c63560185394a0a5cd7249db962a' 2014-02-08 18:38:17 +01:00
libavutil x86inc: Extend FMA_INSTR functionality 2014-02-13 22:14:24 +01:00
libpostproc
libswresample
libswscale
presets
tests Merge commit '8a2250344b19a343d830a902dbcf4c0b929ea49b' 2014-02-14 01:51:17 +01:00
tools tools/uncoded_frame: fix double free 2014-02-13 01:29:01 +01:00
.gitignore
arch.mak
Changelog Add libx265 encoder 2014-02-12 13:13:17 +00:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c
cmdutils.h
common.mak
configure Merge commit 'd261719319a505e1716e8b52fc955bef0503ff96' 2014-02-14 02:45:45 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg_vdpau.c
ffmpeg.c ffmpeg: fix vstats 2014-02-10 20:31:06 +01:00
ffmpeg.h
ffplay.c Merge commit 'b36bc81ccaa2fc85dc4bae7dc546c71e8833573d' 2014-02-10 13:26:31 +01:00
ffprobe.c
ffserver.c ffserver: drop unneeded delay1 var 2014-02-08 00:30:29 -03:00
INSTALL
library.mak
LICENSE Add libx265 encoder 2014-02-12 13:13:17 +00:00
MAINTAINERS MAINTANERS: Add myself as libx265 maintainer 2014-02-13 22:22:56 +00:00
Makefile tools: add uncoded_frame test program. 2014-02-11 10:31:29 +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.