1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Go to file
Michael Niedermayer 0a5ca63c24 Merge commit '4d388c0cd05dd4de545e8ea333ab4de7d67ad12d'
* commit '4d388c0cd05dd4de545e8ea333ab4de7d67ad12d':
  h264_refs: make sure not to write over the bounds of the default ref list

Conflicts:
	libavcodec/h264_refs.c

This condition should be impossible and was checked for by asserts.
the asserts are moved up in this merge to gurantee that no out of array
access can happen even if the state is "impossible".
Also if such impossible states could somehow be created, that should
be dealt with and not silently ignored.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-28 10:45:53 +01:00
compat Merge remote-tracking branch 'qatar/master' 2013-11-24 23:27:32 +01:00
doc doc/default.css: sync with ffmpeg-web 2013-11-28 10:27:25 +01:00
libavcodec Merge commit '4d388c0cd05dd4de545e8ea333ab4de7d67ad12d' 2013-11-28 10:45:53 +01:00
libavdevice lavd/pulse_audio_enc: add buffer size control options 2013-11-27 10:12:54 +01:00
libavfilter Merge remote-tracking branch 'qatar/master' 2013-11-24 05:21:19 +01:00
libavformat MSN Audio support 2013-11-26 08:31:10 +01:00
libavresample Merge remote-tracking branch 'qatar/master' 2013-11-24 05:21:19 +01:00
libavutil avutil/log: check that len is within the buffer before reading it 2013-11-27 17:06:42 +01:00
libpostproc
libswresample lswr: fix assert failure on unknown layouts. 2013-11-03 10:30:37 +01:00
libswscale Merge commit 'c16bfb147df8a9d350e8a0dbc01937b78faf5949' 2013-11-23 12:10:40 +01:00
presets
tests Merge commit '874838dc6589d978611c89a40694a5074f892a76' 2013-11-21 18:49:41 +01:00
tools tools/probetest: also print the time the probe functions needed 2013-11-08 22:33:52 +01:00
.gitignore doc/examples: rename demuxing to demuxing_decoding. 2013-11-04 12:53:06 +01:00
arch.mak
Changelog Merge remote-tracking branch 'qatar/master' 2013-11-26 13:13:45 +01:00
cmdutils_common_opts.h cmdutils: Add -buildconf option. 2013-11-19 22:09:48 +01:00
cmdutils.c Revert "configure: add #include "version.h" to config.h" 2013-11-28 00:19:45 +01:00
cmdutils.h cmdutils: remove this_year constant, use CONFIG_THIS_YEAR instead 2013-11-26 10:03:32 +01:00
common.mak Merge commit 'e8fcdebb17fc59375fd9fc6c0a02a1d2e6d9fb23' 2013-11-15 12:19:45 +01:00
configure Revert "configure: add #include "version.h" to config.h" 2013-11-28 00:19:45 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c Merge remote-tracking branch 'qatar/master' 2013-11-24 05:21:19 +01:00
ffmpeg_opt.c Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea' 2013-11-23 14:46:48 +01:00
ffmpeg_vdpau.c Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea' 2013-11-23 14:46:48 +01:00
ffmpeg.c ffmpeg: set VCFR when copying timestamps 2013-11-28 02:28:50 +01:00
ffmpeg.h Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea' 2013-11-23 14:46:48 +01:00
ffplay.c ffplay: do not call avcodec_register_all() explicitly 2013-11-25 00:03:20 +01:00
ffprobe.c Revert "configure: add #include "version.h" to config.h" 2013-11-28 00:19:45 +01:00
ffserver.c ffserver: clarify feedback in case of wrong AVOptionAudio/Video error 2013-11-28 10:19:03 +01:00
INSTALL
library.mak build: remove pointless condition 2013-10-24 10:51:03 +01:00
LICENSE libavfilter/vf_noise: relicense to LGPL 2013-10-27 20:29:07 +00:00
MAINTAINERS MAINTAINERS: Add 1.2 back to the maintained releases 2013-11-12 14:33:54 +01:00
Makefile Merge commit 'dc80e2f7a529d6e4416b40b68699be16fed62d6c' 2013-11-27 02:09:16 +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.