1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Go to file
Michael Niedermayer 86602d1c79 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  vp6: Reset the internal state when aborting key frames header parsing
  vp56: Release old pictures after a resolution changes
  vp6: Check for huffman tree build errors
  vp56: Check for missing reference frame data
  cinepak: Fix invalid read access on extra data
  vmd: fix segfaults on corruped streams
  cook: Fix js_vlc_bits value validation for joint stereo
  segafilm: Check for memory allocation failures in segafilm demuxer.
  segafilm: Fix potential division by 0 on corrupted streams in the demuxer
  Fixed segfault on corrupted sega streams in the demuxer.
  Fixed deference of NULL pointer in motionpixels decoder.
  libx264: support 9- and 10-bit output.
  h264: correct implicit_weight for field-interlaced pictures.
  mpegvideo: set correct offset for edge emulation buffer.
  mpegvideo: fix position of bottom edge.

Conflicts:
	libavcodec/motionpixels.c
	libavcodec/mpegvideo.c
	libavcodec/version.h
	libavcodec/vmdav.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-07 03:38:50 +02:00
doc Merge remote-tracking branch 'qatar/master' 2011-10-06 03:42:14 +02:00
ffpresets remove libx264 lossless presets 2011-09-26 22:04:23 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2011-10-07 03:38:50 +02:00
libavdevice Merge remote-tracking branch 'qatar/master' 2011-10-06 03:42:14 +02:00
libavfilter deshake: simplify filename check. 2011-10-04 21:36:54 +02:00
libavformat segafilm: Check for memory allocation failures in segafilm demuxer. 2011-10-06 23:19:45 +02:00
libavutil avutil: bump minor version because of av_get_default_channel_layout type fix 2011-10-07 02:53:18 +02:00
libpostproc postproc: fix compilation failure, now really 2011-09-24 01:51:35 +02:00
libswresample swresample: use av_get_default_channel_layout instead of guess_layout 2011-10-07 02:53:18 +02:00
libswscale Enable conversions to YUV444P9/YUV444P10, they seem to work fine. 2011-10-03 21:31:46 +02:00
mt-work
tests fate: fix due to new yuv444 formats 2011-10-03 23:43:22 +02:00
tools graph2dot: show timebase information for audio links 2011-09-17 01:36:32 +02:00
.gitignore gitignore: add libswresample* 2011-09-19 17:39:38 +02:00
avconv.c Merge remote-tracking branch 'qatar/master' 2011-09-29 01:11:01 +02:00
Changelog Add libmodplug support. 2011-10-04 22:36:33 +02:00
cmdutils_common_opts.h
cmdutils.c Show configuration and library version with AV_LOG_INFO. 2011-09-29 12:59:05 +02:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2011-09-27 02:14:37 +02:00
common.mak Add libswresample. 2011-09-19 07:04:17 +02:00
configure configure: fix compilation without libmodplug 2011-10-05 00:34:14 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg.c ffmpeg: make -a/v/sn work with -map 2011-10-06 21:59:50 +02:00
ffplay.c ffplay: use libswresample instead of av_audio_convert 2011-10-02 22:23:11 +02:00
ffprobe.c ffprobe: fix trailing '=' in stream id. 2011-09-28 17:57:22 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2011-10-01 02:54:46 +02:00
INSTALL
LICENSE libaac+ support 2011-09-26 02:28:21 +02:00
MAINTAINERS Add libmodplug support. 2011-10-04 22:36:33 +02:00
Makefile Add libswresample. 2011-09-19 07:04:17 +02:00
README
RELEASE RELEASE: 0.8.5 has been released 2011-10-03 23:32:22 +02:00
subdir.mak
version.sh

FFmpeg README
-------------

1) Documentation
----------------

* Read the documentation in the doc/ directory.

2) Licensing
------------

* See the LICENSE file.