Home Explore Help
Sign In
SMusatov
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Files Wiki
Browse Source

Merge branch 'release/0.7' into oldabi

* release/0.7: (290 commits)
  nuv: Fix combination of size changes and LZO compression.
  av_lzo1x_decode: properly handle negative buffer length.
  Do not call parse_keyframes_index with NULL stream.
  update versions for 0.7 branch
  Version numbers for 0.8.6
  snow: emu edge support Fixes Ticket592
  imc: validate channel count
  imc: check for ff_fft_init() failure (cherry picked from commit 95fee70d6773fde1c34ff6422f48e5e66f37f263)
  libgsmdec: check output buffer size before decoding (cherry picked from commit b03761b1309293bbf30edef767503875277b01cf)
  configure: fix arch x86_32
  mp3enc: avoid truncating id3v1 tags by one byte
  asfdec: Check packet_replic_size earlier
  cin audio: validate the channel count
  binkaudio: add some buffer overread checks.
  atrac1: validate number of channels (cherry picked from commit bff5b2c1ca1290ea30587ff2f76171f9e3854872)
  atrac1: check output buffer size before decoding (cherry picked from commit 33684b9c12b74c0140fb91e8150263db4a48d55e)
  vp3: fix oob read for negative tokens and memleaks on error. (cherry picked from commit 8370e426e42f2e4b9d14a1fb8107ecfe5163ce7f)
  apedec: set s->currentframeblocks after validating nblocks
  apedec: use unsigned int for 'nblocks' and make sure that it's within int range
  apedec: check for data buffer realloc failure (cherry picked from commit 11ca8b2d7486e879926488404b3b79af774f0f2d)
  ...

Conflicts:
	Changelog
	Makefile
	RELEASE
	configure
	libavcodec/error_resilience.c
	libavcodec/mpegvideo.c
	libavformat/matroskaenc.c
	tests/ref/lavf/mxf

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer 13 years ago
parent
661e081176 3970d4e728
commit
57bf0d1fe5
10 changed files with 110 additions and 833 deletions
Split View Show Diff Stats
  1. 0 798
      Changelog
  2. 1 1
      Doxyfile
  3. 3 3
      LICENSE
  4. 1 1
      MAINTAINERS
  5. 1 1
      VERSION
  6. 18 3
      configure
  7. 3 3
      doc/filters.texi
  8. 3 1
      doc/general.texi
  9. 2 2
      ffmpeg.c
  10. 78 20
      libavcodec/4xm.c

+ 0 - 798
Changelog
View File 

@@ -1,798 +0,0 @@
 
-Entries are sorted chronologically from oldest to youngest within each release,
 
-releases are sorted from youngest to oldest.
 
-
 
-version next:
 
-
 
-<<<<<<< HEAD
 
-- openal input device added
 
-- boxblur filter added
 
-- BWF muxer
 
-- Flash Screen Video 2 decoder
 
-||||||| merged common ancestors
 
-version 0.7:
 
-
 
-- many many things we forgot because we rather write code than changelogs
 
-- libmpcodecs video filter support (3 times as many filters than before)
 
-- mpeg2 aspect ratio dection fixed
 
-- libxvid aspect pickiness fixed
 
-- Frame multithreaded decoding
 
-- E-AC-3 audio encoder
 
-- ac3enc: add channel coupling support
 
-- floating-point sample format support to the ac3, eac3, dca, aac, and vorbis decoders.
 
-- H264/MPEG frame-level multi-threading
 
-- All av_metadata_* functions renamed to av_dict_* and moved to libavutil
 
-- 4:4:4 H.264 decoding support
 
-- 10-bit H.264 optimizations for x86
 
-- lut, lutrgb, and lutyuv filters added
 
-- buffersink libavfilter sink added
 
-- Bump libswscale for recently reported ABI break
 
-
 
-=======
 
-version 0.7.1:
 
-
 
-- added various additional FOURCC codec identifiers
 
-- H.264 4:4:4 fixes
 
-- build system and compilation fixes
 
-- Doxygen and general documentation corrections and improvements
 
-- fixed segfault in ffprobe
 
-- behavioral fix in av_open_input_stream()
 
-- Licensing clarification for LGPL'ed vf_gradfun
 
-- bugfixes while seeking in multithreaded decoding
 
-- support newer versions of OpenCV
 
-- ffmpeg: fix operation with --disable-avfilter
 
-- fixed integer underflow in matroska decoder
 
-
 
-version 0.7:
 
-
 
-- many many things we forgot because we rather write code than changelogs
 
-- libmpcodecs video filter support (3 times as many filters than before)
 
-- mpeg2 aspect ratio dection fixed
 
-- libxvid aspect pickiness fixed
 
-- Frame multithreaded decoding
 
-- E-AC-3 audio encoder
 
-- ac3enc: add channel coupling support
 
-- floating-point sample format support for (E-)AC-3, DCA, AAC, Vorbis decoders
 
-- H.264/MPEG frame-level multithreading
 
-- av_metadata_* functions renamed to av_dict_* and moved to libavutil
 
-- 4:4:4 H.264 decoding support
 
-- 10-bit H.264 optimizations for x86
 
-- lut, lutrgb, and lutyuv filters added
 
-- buffersink libavfilter sink added
 
-- bump libswscale for recently reported ABI break
 
-
 
->>>>>>> release/0.7
 
-
 
-<<<<<<< HEAD
 
-||||||| merged common ancestors
 
-version 0.7_beta2:
 
-
 
-- VP8 frame-multithreading
 
-- NEON optimizations for VP8
 
-- Lots of deprecated API cruft removed
 
-- fft and imdct optimizations for AVX (Sandy Bridge) processors
 
-- showinfo filter added
 
-- DPX image encoder
 
-- SMPTE 302M AES3 audio decoder
 
-- Apple Core Audio Format muxer
 
-- 9bit and 10bit per sample support in the H.264 decoder
 
-- 9bit and 10bit FFV1 encoding / decoding
 
-- split filter added
 
-- select filter added
 
-- sdl output device added
 
-=======
 
-version 0.7_beta2:
 
-
 
-- VP8 frame-level multithreading
 
-- NEON optimizations for VP8
 
-- removed a lot of deprecated API cruft
 
-- FFT and IMDCT optimizations for AVX (Sandy Bridge) processors
 
-- showinfo filter added
 
-- DPX image encoder
 
-- SMPTE 302M AES3 audio decoder
 
-- Apple Core Audio Format muxer
 
-- 9bit and 10bit per sample support in the H.264 decoder
 
-- 9bit and 10bit FFV1 encoding / decoding
 
-- split filter added
 
-- select filter added
 
-- sdl output device added
 
->>>>>>> release/0.7
 
-
 
-version 0.8:
 
-
 
-
 
-- many many things we forgot because we rather write code than changelogs
 
-- WebM support in Matroska de/muxer
 
-- low overhead Ogg muxing
 
-- MMS-TCP support
 
-- VP8 de/encoding via libvpx
 
-- Demuxer for On2's IVF format
 
-- Pictor/PC Paint decoder
 
-- HE-AAC v2 decoder
 
-- libfaad2 wrapper removed
 
-- DTS-ES extension (XCh) decoding support
 
-- native VP8 decoder
 
-- RTSP tunneling over HTTP
 
-- RTP depacketization of SVQ3
 
-- -strict inofficial replaced by -strict unofficial
 
-- ffplay -exitonkeydown and -exitonmousedown options added
 
-- native GSM / GSM MS decoder
 
-- RTP depacketization of QDM2
 
-- ANSI/ASCII art playback system
 
-- Lego Mindstorms RSO de/muxer
 
-- libavcore added (and subsequently removed)
 
-- SubRip subtitle file muxer and demuxer
 
-- Chinese AVS encoding via libxavs
 
-- ffprobe -show_packets option added
 
-- RTP packetization of Theora and Vorbis
 
-- RTP depacketization of MP4A-LATM
 
-- RTP packetization and depacketization of VP8
 
-- hflip filter
 
-- Apple HTTP Live Streaming demuxer
 
-- a64 codec
 
-- MMS-HTTP support
 
-- G.722 ADPCM audio encoder/decoder
 
-- R10k video decoder
 
-- ocv_smooth filter
 
-- frei0r wrapper filter
 
-- change crop filter syntax to width:height:x:y
 
-- make the crop filter accept parametric expressions
 
-- make ffprobe accept AVFormatContext options
 
-- yadif filter
 
-- blackframe filter
 
-- Demuxer for Leitch/Harris' VR native stream format (LXF)
 
-- RTP depacketization of the X-QT QuickTime format
 
-- SAP (Session Announcement Protocol, RFC 2974) muxer and demuxer
 
-- cropdetect filter
 
-- ffmpeg -crop* options removed
 
-- transpose filter added
 
-- ffmpeg -force_key_frames option added
 
-- demuxer for receiving raw rtp:// URLs without an SDP description
 
-- single stream LATM/LOAS decoder
 
-- setpts filter added
 
-- Win64 support for optimized x86 assembly functions
 
-- MJPEG/AVI1 to JPEG/JFIF bitstream filter
 
-- ASS subtitle encoder and decoder
 
-- IEC 61937 encapsulation for E-AC-3, TrueHD, DTS-HD (for HDMI passthrough)
 
-- overlay filter added
 
-- rename aspect filter to setdar, and pixelaspect to setsar
 
-- IEC 61937 demuxer
 
-- Mobotix .mxg demuxer
 
-- frei0r source added
 
-- hqdn3d filter added
 
-- RTP depacketization of QCELP
 
-- FLAC parser added
 
-- gradfun filter added
 
-- AMR-WB decoder
 
-- replace the ocv_smooth filter with a more generic ocv filter
 
-- Windows Televison (WTV) demuxer
 
-- FFmpeg metadata format muxer and demuxer
 
-- SubRip (srt) subtitle encoder and decoder
 
-- floating-point AC-3 encoder added
 
-- Lagarith decoder
 
-- ffmpeg -copytb option added
 
-- IVF muxer added
 
-- Wing Commander IV movies decoder added
 
-- movie source added
 
-- Bink version 'b' audio and video decoder
 
-- Bitmap Brothers JV playback system
 
-- Apple HTTP Live Streaming protocol handler
 
-- sndio support for playback and record
 
-- Linux framebuffer input device added
 
-- Chronomaster DFA decoder
 
-- DPX image encoder
 
-- MicroDVD subtitle file muxer and demuxer
 
-- Playstation Portable PMP format demuxer
 
-- fieldorder video filter added
 
-- AAC encoding via libvo-aacenc
 
-- AMR-WB encoding via libvo-amrwbenc
 
-- xWMA demuxer
 
-- Mobotix MxPEG decoder
 
-- VP8 frame-multithreading
 
-- NEON optimizations for VP8
 
-- Lots of deprecated API cruft removed
 
-- fft and imdct optimizations for AVX (Sandy Bridge) processors
 
-- showinfo filter added
 
-- SMPTE 302M AES3 audio decoder
 
-- Apple Core Audio Format muxer
 
-- 9bit and 10bit per sample support in the H.264 decoder
 
-- 9bit and 10bit FFV1 encoding / decoding
 
-- split filter added
 
-- select filter added
 
-- sdl output device added
 
-- libmpcodecs video filter support (3 times as many filters than before)
 
-- mpeg2 aspect ratio dection fixed
 
-- libxvid aspect pickiness fixed
 
-- Frame multithreaded decoding
 
-- E-AC-3 audio encoder
 
-- ac3enc: add channel coupling support
 
-- floating-point sample format support to the ac3, eac3, dca, aac, and vorbis decoders.
 
-- H264/MPEG frame-level multi-threading
 
-- All av_metadata_* functions renamed to av_dict_* and moved to libavutil
 
-- 4:4:4 H.264 decoding support
 
-- 10-bit H.264 optimizations for x86
 
-- lut, lutrgb, and lutyuv filters added
 
-- buffersink libavfilter sink added
 
-- Bump libswscale for recently reported ABI break
 
-
 
-
 
-version 0.7:
 
-
 
-- all the changes for 0.8, but keeping API/ABI compatibility with the 0.6 release
 
-
 
-
 
-version 0.6:
 
-
 
-- PB-frame decoding for H.263
 
-- deprecated vhook subsystem removed
 
-- deprecated old scaler removed
 
-- VQF demuxer
 
-- Alpha channel scaler
 
-- PCX encoder
 
-- RTP packetization of H.263
 
-- RTP packetization of AMR
 
-- RTP depacketization of Vorbis
 
-- CorePNG decoding support
 
-- Cook multichannel decoding support
 
-- introduced avlanguage helpers in libavformat
 
-- 8088flex TMV demuxer and decoder
 
-- per-stream language-tags extraction in asfdec
 
-- V210 decoder and encoder
 
-- remaining GPL parts in AC-3 decoder converted to LGPL
 
-- QCP demuxer
 
-- SoX native format muxer and demuxer
 
-- AMR-NB decoding/encoding, AMR-WB decoding via OpenCORE libraries
 
-- DPX image decoder
 
-- Electronic Arts Madcow decoder
 
-- DivX (XSUB) subtitle encoder
 
-- nonfree libamr support for AMR-NB/WB decoding/encoding removed
 
-- experimental AAC encoder
 
-- RTP depacketization of ASF and RTSP from WMS servers
 
-- RTMP support in libavformat
 
-- noX handling for OPT_BOOL X options
 
-- Wave64 demuxer
 
-- IEC-61937 compatible Muxer
 
-- TwinVQ decoder
 
-- Bluray (PGS) subtitle decoder
 
-- LPCM support in MPEG-TS (HDMV RID as found on Blu-ray disks)
 
-- WMA Pro decoder
 
-- Core Audio Format demuxer
 
-- Atrac1 decoder
 
-- MD STUDIO audio demuxer
 
-- RF64 support in WAV demuxer
 
-- MPEG-4 Audio Lossless Coding (ALS) decoder
 
-- -formats option split into -formats, -codecs, -bsfs, and -protocols
 
-- IV8 demuxer
 
-- CDG demuxer and decoder
 
-- R210 decoder
 
-- Auravision Aura 1 and 2 decoders
 
-- Deluxe Paint Animation playback system
 
-- SIPR decoder
 
-- Adobe Filmstrip muxer and demuxer
 
-- RTP depacketization of H.263
 
-- Bink demuxer and audio/video decoders
 
-- enable symbol versioning by default for linkers that support it
 
-- IFF PBM/ILBM bitmap decoder
 
-- concat protocol
 
-- Indeo 5 decoder
 
-- RTP depacketization of AMR
 
-- WMA Voice decoder
 
-- ffprobe tool
 
-- AMR-NB decoder
 
-- RTSP muxer
 
-- HE-AAC v1 decoder
 
-- Kega Game Video (KGV1) decoder
 
-- VorbisComment writing for FLAC, Ogg FLAC and Ogg Speex files
 
-- RTP depacketization of Theora
 
-- HTTP Digest authentication
 
-- RTMP/RTMPT/RTMPS/RTMPE/RTMPTE protocol support via librtmp
 
-- Psygnosis YOP demuxer and video decoder
 
-- spectral extension support in the E-AC-3 decoder
 
-- unsharp video filter
 
-- RTP hinting in the mov/3gp/mp4 muxer
 
-- Dirac in Ogg demuxing
 
-- seek to keyframes in Ogg
 
-- 4:2:2 and 4:4:4 Theora decoding
 
-- 35% faster VP3/Theora decoding
 
-- faster AAC decoding
 
-- faster H.264 decoding
 
-- RealAudio 1.0 (14.4K) encoder
 
-
 
-
 
-version 0.5:
 
-
 
-- DV50 AKA DVCPRO50 encoder, decoder, muxer and demuxer
 
-- TechSmith Camtasia (TSCC) video decoder
 
-- IBM Ultimotion (ULTI) video decoder
 
-- Sierra Online audio file demuxer and decoder
 
-- Apple QuickDraw (qdrw) video decoder
 
-- Creative ADPCM audio decoder (16 bits as well as 8 bits schemes)
 
-- Electronic Arts Multimedia (WVE/UV2/etc.) file demuxer
 
-- Miro VideoXL (VIXL) video decoder
 
-- H.261 video encoder
 
-- QPEG video decoder
 
-- Nullsoft Video (NSV) file demuxer
 
-- Shorten audio decoder
 
-- LOCO video decoder
 
-- Apple Lossless Audio Codec (ALAC) decoder
 
-- Winnov WNV1 video decoder
 
-- Autodesk Animator Studio Codec (AASC) decoder
 
-- Indeo 2 video decoder
 
-- Fraps FPS1 video decoder
 
-- Snow video encoder/decoder
 
-- Sonic audio encoder/decoder
 
-- Vorbis audio decoder
 
-- Macromedia ADPCM decoder
 
-- Duck TrueMotion 2 video decoder
 
-- support for decoding FLX and DTA extensions in FLIC files
 
-- H.264 custom quantization matrices support
 
-- ffserver fixed, it should now be usable again
 
-- QDM2 audio decoder
 
-- Real Cooker audio decoder
 
-- TrueSpeech audio decoder
 
-- WMA2 audio decoder fixed, now all files should play correctly
 
-- RealAudio 14.4 and 28.8 decoders fixed
 
-- JPEG-LS decoder
 
-- build system improvements
 
-- tabs and trailing whitespace removed from the codebase
 
-- CamStudio video decoder
 
-- AIFF/AIFF-C audio format, encoding and decoding
 
-- ADTS AAC file reading and writing
 
-- Creative VOC file reading and writing
 
-- American Laser Games multimedia (*.mm) playback system
 
-- Zip Motion Blocks Video decoder
 
-- improved Theora/VP3 decoder
 
-- True Audio (TTA) decoder
 
-- AVS demuxer and video decoder
 
-- JPEG-LS encoder
 
-- Smacker demuxer and decoder
 
-- NuppelVideo/MythTV demuxer and RTjpeg decoder
 
-- KMVC decoder
 
-- MPEG-2 intra VLC support
 
-- MPEG-2 4:2:2 encoder
 
-- Flash Screen Video decoder
 
-- GXF demuxer
 
-- Chinese AVS decoder
 
-- GXF muxer
 
-- MXF demuxer
 
-- VC-1/WMV3/WMV9 video decoder
 
-- MacIntel support
 
-- AVISynth support
 
-- VMware video decoder
 
-- VP5 video decoder
 
-- VP6 video decoder
 
-- WavPack lossless audio decoder
 
-- Targa (.TGA) picture decoder
 
-- Vorbis audio encoder
 
-- Delphine Software .cin demuxer/audio and video decoder
 
-- Tiertex .seq demuxer/video decoder
 
-- MTV demuxer
 
-- TIFF picture encoder and decoder
 
-- GIF picture decoder
 
-- Intel Music Coder decoder
 
-- Zip Motion Blocks Video encoder
 
-- Musepack decoder
 
-- Flash Screen Video encoder
 
-- Theora encoding via libtheora
 
-- BMP encoder
 
-- WMA encoder
 
-- GSM-MS encoder and decoder
 
-- DCA decoder
 
-- DXA demuxer and decoder
 
-- DNxHD decoder
 
-- Gamecube movie (.THP) playback system
 
-- Blackfin optimizations
 
-- Interplay C93 demuxer and video decoder
 
-- Bethsoft VID demuxer and video decoder
 
-- CRYO APC demuxer
 
-- Atrac3 decoder
 
-- V.Flash PTX decoder
 
-- RoQ muxer, RoQ audio encoder
 
-- Renderware TXD demuxer and decoder
 
-- extern C declarations for C++ removed from headers
 
-- sws_flags command line option
 
-- codebook generator
 
-- RoQ video encoder
 
-- QTRLE encoder
 
-- OS/2 support removed and restored again
 
-- AC-3 decoder
 
-- NUT muxer
 
-- additional SPARC (VIS) optimizations
 
-- Matroska muxer
 
-- slice-based parallel H.264 decoding
 
-- Monkey's Audio demuxer and decoder
 
-- AMV audio and video decoder
 
-- DNxHD encoder
 
-- H.264 PAFF decoding
 
-- Nellymoser ASAO decoder
 
-- Beam Software SIFF demuxer and decoder
 
-- libvorbis Vorbis decoding removed in favor of native decoder
 
-- IntraX8 (J-Frame) subdecoder for WMV2 and VC-1
 
-- Ogg (Theora, Vorbis and FLAC) muxer
 
-- The "device" muxers and demuxers are now in a new libavdevice library
 
-- PC Paintbrush PCX decoder
 
-- Sun Rasterfile decoder
 
-- TechnoTrend PVA demuxer
 
-- Linux Media Labs MPEG-4 (LMLM4) demuxer
 
-- AVM2 (Flash 9) SWF muxer
 
-- QT variant of IMA ADPCM encoder
 
-- VFW grabber
 
-- iPod/iPhone compatible mp4 muxer
 
-- Mimic decoder
 
-- MSN TCP Webcam stream demuxer
 
-- RL2 demuxer / decoder
 
-- IFF demuxer
 
-- 8SVX audio decoder
 
-- non-recursive Makefiles
 
-- BFI demuxer
 
-- MAXIS EA XA (.xa) demuxer / decoder
 
-- BFI video decoder
 
-- OMA demuxer
 
-- MLP/TrueHD decoder
 
-- Electronic Arts CMV decoder
 
-- Motion Pixels Video decoder
 
-- Motion Pixels MVI demuxer
 
-- removed animated GIF decoder/demuxer
 
-- D-Cinema audio muxer
 
-- Electronic Arts TGV decoder
 
-- Apple Lossless Audio Codec (ALAC) encoder
 
-- AAC decoder
 
-- floating point PCM encoder/decoder
 
-- MXF muxer
 
-- DV100 AKA DVCPRO HD decoder and demuxer
 
-- E-AC-3 support added to AC-3 decoder
 
-- Nellymoser ASAO encoder
 
-- ASS and SSA demuxer and muxer
 
-- liba52 wrapper removed
 
-- SVQ3 watermark decoding support
 
-- Speex decoding via libspeex
 
-- Electronic Arts TGQ decoder
 
-- RV40 decoder
 
-- QCELP / PureVoice decoder
 
-- RV30 decoder
 
-- hybrid WavPack support
 
-- R3D REDCODE demuxer
 
-- ALSA support for playback and record
 
-- Electronic Arts TQI decoder
 
-- OpenJPEG based JPEG 2000 decoder
 
-- NC (NC4600) camera file demuxer
 
-- Gopher client support
 
-- MXF D-10 muxer
 
-- generic metadata API
 
-- flash ScreenVideo2 encoder
 
-
 
-
 
-version 0.4.9-pre1:
 
-
 
-- DV encoder, DV muxer
 
-- Microsoft RLE video decoder
 
-- Microsoft Video-1 decoder
 
-- Apple Animation (RLE) decoder
 
-- Apple Graphics (SMC) decoder
 
-- Apple Video (RPZA) decoder
 
-- Cinepak decoder
 
-- Sega FILM (CPK) file demuxer
 
-- Westwood multimedia support (VQA & AUD files)
 
-- Id Quake II CIN playback support
 
-- 8BPS video decoder
 
-- FLIC playback support
 
-- RealVideo 2.0 (RV20) decoder
 
-- Duck TrueMotion v1 (DUCK) video decoder
 
-- Sierra VMD demuxer and video decoder
 
-- MSZH and ZLIB decoder support
 
-- SVQ1 video encoder
 
-- AMR-WB support
 
-- PPC optimizations
 
-- rate distortion optimal cbp support
 
-- rate distorted optimal ac prediction for MPEG-4
 
-- rate distorted optimal lambda->qp support
 
-- AAC encoding with libfaac
 
-- Sunplus JPEG codec (SP5X) support
 
-- use Lagrange multipler instead of QP for ratecontrol
 
-- Theora/VP3 decoding support
 
-- XA and ADX ADPCM codecs
 
-- export MPEG-2 active display area / pan scan
 
-- Add support for configuring with IBM XLC
 
-- floating point AAN DCT
 
-- initial support for zygo video (not complete)
 
-- RGB ffv1 support
 
-- new audio/video parser API
 
-- av_log() system
 
-- av_read_frame() and av_seek_frame() support
 
-- missing last frame fixes
 
-- seek by mouse in ffplay
 
-- noise reduction of DCT coefficients
 
-- H.263 OBMC & 4MV support
 
-- H.263 alternative inter vlc support
 
-- H.263 loop filter
 
-- H.263 slice structured mode
 
-- interlaced DCT support for MPEG-2 encoding
 
-- stuffing to stay above min_bitrate
 
-- MB type & QP visualization
 
-- frame stepping for ffplay
 
-- interlaced motion estimation
 
-- alternate scantable support
 
-- SVCD scan offset support
 
-- closed GOP support
 
-- SSE2 FDCT
 
-- quantizer noise shaping
 
-- G.726 ADPCM audio codec
 
-- MS ADPCM encoding
 
-- multithreaded/SMP motion estimation
 
-- multithreaded/SMP encoding for MPEG-1/MPEG-2/MPEG-4/H.263
 
-- multithreaded/SMP decoding for MPEG-2
 
-- FLAC decoder
 
-- Metrowerks CodeWarrior suppport
 
-- H.263+ custom pcf support
 
-- nicer output for 'ffmpeg -formats'
 
-- Matroska demuxer
 
-- SGI image format, encoding and decoding
 
-- H.264 loop filter support
 
-- H.264 CABAC support
 
-- nicer looking arrows for the motion vector visualization
 
-- improved VCD support
 
-- audio timestamp drift compensation
 
-- MPEG-2 YUV 422/444 support
 
-- polyphase kaiser windowed sinc and blackman nuttall windowed sinc audio resample
 
-- better image scaling
 
-- H.261 support
 
-- correctly interleave packets during encoding
 
-- VIS optimized motion compensation
 
-- intra_dc_precision>0 encoding support
 
-- support reuse of motion vectors/MB types/field select values of the source video
 
-- more accurate deblock filter
 
-- padding support
 
-- many optimizations and bugfixes
 
-- FunCom ISS audio file demuxer and according ADPCM decoding
 
-
 
-
 
-version 0.4.8:
 
-
 
-- MPEG-2 video encoding (Michael)
 
-- Id RoQ playback subsystem (Mike Melanson and Tim Ferguson)
 
-- Wing Commander III Movie (.mve) file playback subsystem (Mike Melanson
 
-  and Mario Brito)
 
-- Xan DPCM audio decoder (Mario Brito)
 
-- Interplay MVE playback subsystem (Mike Melanson)
 
-- Duck DK3 and DK4 ADPCM audio decoders (Mike Melanson)
 
-
 
-
 
-version 0.4.7:
 
-
 
-- RealAudio 1.0 (14_4) and 2.0 (28_8) native decoders. Author unknown, code from mplayerhq
 
-  (originally from public domain player for Amiga at http://www.honeypot.net/audio)
 
-- current version now also compiles with older GCC (Fabrice)
 
-- 4X multimedia playback system including 4xm file demuxer (Mike
 
-  Melanson), and 4X video and audio codecs (Michael)
 
-- Creative YUV (CYUV) decoder (Mike Melanson)
 
-- FFV1 codec (our very simple lossless intra only codec, compresses much better
 
-  than HuffYUV) (Michael)
 
-- ASV1 (Asus), H.264, Intel indeo3 codecs have been added (various)
 
-- tiny PNG encoder and decoder, tiny GIF decoder, PAM decoder (PPM with
 
-  alpha support), JPEG YUV colorspace support. (Fabrice Bellard)
 
-- ffplay has been replaced with a newer version which uses SDL (optionally)
 
-  for multiplatform support (Fabrice)
 
-- Sorenson Version 3 codec (SVQ3) support has been added (decoding only) - donated
 
-  by anonymous
 
-- AMR format has been added (Johannes Carlsson)
 
-- 3GP support has been added (Johannes Carlsson)
 
-- VP3 codec has been added (Mike Melanson)
 
-- more MPEG-1/2 fixes
 
-- better multiplatform support, MS Visual Studio fixes (various)
 
-- AltiVec optimizations (Magnus Damn and others)
 
-- SH4 processor support has been added (BERO)
 
-- new public interfaces (avcodec_get_pix_fmt) (Roman Shaposhnick)
 
-- VOB streaming support (Brian Foley)
 
-- better MP3 autodetection (Andriy Rysin)
 
-- qpel encoding (Michael)
 
-- 4mv+b frames encoding finally fixed (Michael)
 
-- chroma ME (Michael)
 
-- 5 comparison functions for ME (Michael)
 
-- B-frame encoding speedup (Michael)
 
-- WMV2 codec (unfinished - Michael)
 
-- user specified diamond size for EPZS (Michael)
 
-- Playstation STR playback subsystem, still experimental (Mike and Michael)
 
-- ASV2 codec (Michael)
 
-- CLJR decoder (Alex)
 
-
 
-.. And lots more new enhancements and fixes.
 
-
 
-
 
-version 0.4.6:
 
-
 
-- completely new integer only MPEG audio layer 1/2/3 decoder rewritten
 
-  from scratch
 
-- Recoded DCT and motion vector search with gcc (no longer depends on nasm)
 
-- fix quantization bug in AC3 encoder
 
-- added PCM codecs and format. Corrected WAV/AVI/ASF PCM issues
 
-- added prototype ffplay program
 
-- added GOB header parsing on H.263/H.263+ decoder (Juanjo)
 
-- bug fix on MCBPC tables of H.263 (Juanjo)
 
-- bug fix on DC coefficients of H.263 (Juanjo)
 
-- added Advanced Prediction Mode on H.263/H.263+ decoder (Juanjo)
 
-- now we can decode H.263 streams found in QuickTime files (Juanjo)
 
-- now we can decode H.263 streams found in VIVO v1 files(Juanjo)
 
-- preliminary RTP "friendly" mode for H.263/H.263+ coding. (Juanjo)
 
-- added GOB header for H.263/H.263+ coding on RTP mode (Juanjo)
 
-- now H.263 picture size is returned on the first decoded frame (Juanjo)
 
-- added first regression tests
 
-- added MPEG-2 TS demuxer
 
-- new demux API for libav
 
-- more accurate and faster IDCT (Michael)
 
-- faster and entropy-controlled motion search (Michael)
 
-- two pass video encoding (Michael)
 
-- new video rate control (Michael)
 
-- added MSMPEG4V1, MSMPEGV2 and WMV1 support (Michael)
 
-- great performance improvement of video encoders and decoders (Michael)
 
-- new and faster bit readers and vlc parsers (Michael)
 
-- high quality encoding mode: tries all macroblock/VLC types (Michael)
 
-- added DV video decoder
 
-- preliminary RTP/RTSP support in ffserver and libavformat
 
-- H.263+ AIC decoding/encoding support (Juanjo)
 
-- VCD MPEG-PS mode (Juanjo)
 
-- PSNR stuff (Juanjo)
 
-- simple stats output (Juanjo)
 
-- 16-bit and 15-bit RGB/BGR/GBR support (Bisqwit)
 
-
 
-
 
-version 0.4.5:
 
-
 
-- some header fixes (Zdenek Kabelac <kabi at informatics.muni.cz>)
 
-- many MMX optimizations (Nick Kurshev <nickols_k at mail.ru>)
 
-- added configure system (actually a small shell script)
 
-- added MPEG audio layer 1/2/3 decoding using LGPL'ed mpglib by
 
-  Michael Hipp (temporary solution - waiting for integer only
 
-  decoder)
 
-- fixed VIDIOCSYNC interrupt
 
-- added Intel H.263 decoding support ('I263' AVI fourCC)
 
-- added Real Video 1.0 decoding (needs further testing)
 
-- simplified image formats again. Added PGM format (=grey
 
-  pgm). Renamed old PGM to PGMYUV.
 
-- fixed msmpeg4 slice issues (tell me if you still find problems)
 
-- fixed OpenDivX bugs with newer versions (added VOL header decoding)
 
-- added support for MPlayer interface
 
-- added macroblock skip optimization
 
-- added MJPEG decoder
 
-- added mmx/mmxext IDCT from libmpeg2
 
-- added pgmyuvpipe, ppm, and ppm_pipe formats (original patch by Celer
 
-  <celer at shell.scrypt.net>)
 
-- added pixel format conversion layer (e.g. for MJPEG or PPM)
 
-- added deinterlacing option
 
-- MPEG-1/2 fixes
 
-- MPEG-4 vol header fixes (Jonathan Marsden <snmjbm at pacbell.net>)
 
-- ARM optimizations (Lionel Ulmer <lionel.ulmer at free.fr>).
 
-- Windows porting of file converter
 
-- added MJPEG raw format (input/ouput)
 
-- added JPEG image format support (input/output)
 
-
 
-
 
-version 0.4.4:
 
-
 
-- fixed some std header definitions (Bjorn Lindgren
 
-  <bjorn.e.lindgren at telia.com>).
 
-- added MPEG demuxer (MPEG-1 and 2 compatible).
 
-- added ASF demuxer
 
-- added prototype RM demuxer
 
-- added AC3 decoding (done with libac3 by Aaron Holtzman)
 
-- added decoding codec parameter guessing (.e.g. for MPEG, because the
 
-  header does not include them)
 
-- fixed header generation in MPEG-1, AVI and ASF muxer: wmplayer can now
 
-  play them (only tested video)
 
-- fixed H.263 white bug
 
-- fixed phase rounding in img resample filter
 
-- add MMX code for polyphase img resample filter
 
-- added CPU autodetection
 
-- added generic title/author/copyright/comment string handling (ASF and RM
 
-  use them)
 
-- added SWF demux to extract MP3 track (not usable yet because no MP3
 
-  decoder)
 
-- added fractional frame rate support
 
-- codecs are no longer searched by read_header() (should fix ffserver
 
-  segfault)
 
-
 
-
 
-version 0.4.3:
 
-
 
-- BGR24 patch (initial patch by Jeroen Vreeken <pe1rxq at amsat.org>)
 
-- fixed raw yuv output
 
-- added motion rounding support in MPEG-4
 
-- fixed motion bug rounding in MSMPEG4
 
-- added B-frame handling in video core
 
-- added full MPEG-1 decoding support
 
-- added partial (frame only) MPEG-2 support
 
-- changed the FOURCC code for H.263 to "U263" to be able to see the
 
-  +AVI/H.263 file with the UB Video H.263+ decoder. MPlayer works with
 
-  this +codec ;) (JuanJo).
 
-- Halfpel motion estimation after MB type selection (JuanJo)
 
-- added pgm and .Y.U.V output format
 
-- suppressed 'img:' protocol. Simply use: /tmp/test%d.[pgm|Y] as input or
 
-  output.
 
-- added pgmpipe I/O format (original patch from Martin Aumueller
 
-  <lists at reserv.at>, but changed completely since we use a format
 
-  instead of a protocol)
 
-
 
-
 
-version 0.4.2:
 
-
 
-- added H.263/MPEG-4/MSMPEG4 decoding support. MPEG-4 decoding support
 
-  (for OpenDivX) is almost complete: 8x8 MVs and rounding are
 
-  missing. MSMPEG4 support is complete.
 
-- added prototype MPEG-1 decoder. Only I- and P-frames handled yet (it
 
-  can decode ffmpeg MPEGs :-)).
 
-- added libavcodec API documentation (see apiexample.c).
 
-- fixed image polyphase bug (the bottom of some images could be
 
-  greenish)
 
-- added support for non clipped motion vectors (decoding only)
 
-  and image sizes non-multiple of 16
 
-- added support for AC prediction (decoding only)
 
-- added file overwrite confirmation (can be disabled with -y)
 
-- added custom size picture to H.263 using H.263+ (Juanjo)
 
-
 
-
 
-version 0.4.1:
 
-
 
-- added MSMPEG4 (aka DivX) compatible encoder. Changed default codec
 
-  of AVI and ASF to DIV3.
 
-- added -me option to set motion estimation method
 
-  (default=log). suppressed redundant -hq option.
 
-- added options -acodec and -vcodec to force a given codec (useful for
 
-  AVI for example)
 
-- fixed -an option
 
-- improved dct_quantize speed
 
-- factorized some motion estimation code
 
-
 
-
 
-version 0.4.0:
 
-
 
-- removing grab code from ffserver and moved it to ffmpeg. Added
 
-  multistream support to ffmpeg.
 
-- added timeshifting support for live feeds (option ?date=xxx in the
 
-  URL)
 
-- added high quality image resize code with polyphase filter (need
 
-  mmx/see optimization). Enable multiple image size support in ffserver.
 
-- added multi live feed support in ffserver
 
-- suppressed master feature from ffserver (it should be done with an
 
-  external program which opens the .ffm url and writes it to another
 
-  ffserver)
 
-- added preliminary support for video stream parsing (WAV and AVI half
 
-  done). Added proper support for audio/video file conversion in
 
-  ffmpeg.
 
-- added preliminary support for video file sending from ffserver
 
-- redesigning I/O subsystem: now using URL based input and output
 
-  (see avio.h)
 
-- added WAV format support
 
-- added "tty user interface" to ffmpeg to stop grabbing gracefully
 
-- added MMX/SSE optimizations to SAD (Sums of Absolutes Differences)
 
-  (Juan J. Sierralta P. a.k.a. "Juanjo" <juanjo at atmlab.utfsm.cl>)
 
-- added MMX DCT from mpeg2_movie 1.5 (Juanjo)
 
-- added new motion estimation algorithms, log and phods (Juanjo)
 
-- changed directories: libav for format handling, libavcodec for
 
-  codecs
 
-
 
-
 
-version 0.3.4:
 
-
 
-- added stereo in MPEG audio encoder
 
-
 
-
 
-version 0.3.3:
 
-
 
-- added 'high quality' mode which use motion vectors. It can be used in
 
-  real time at low resolution.
 
-- fixed rounding problems which caused quality problems at high
 
-  bitrates and large GOP size
 
-
 
-
 
-version 0.3.2: small fixes
 
-
 
-- ASF fixes
 
-- put_seek bug fix
 
-
 
-
 
-version 0.3.1: added avi/divx support
 
-
 
-- added AVI support
 
-- added MPEG-4 codec compatible with OpenDivX. It is based on the H.263 codec
 
-- added sound for flash format (not tested)
 
-
 
-
 
-version 0.3: initial public release

+ 1 - 1
Doxyfile
View File 

@@ -31,7 +31,7 @@ PROJECT_NAME           = FFmpeg
 
 # This could be handy for archiving the generated documentation or
 
 # if some version control system is used.
 
 
-PROJECT_NUMBER         = 0.7.5
 
+PROJECT_NUMBER         = 0.7.7
 
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 
 # base path where the generated documentation will be put.

+ 3 - 3
LICENSE
View File 

@@ -41,6 +41,6 @@ is incompatible with the LGPL v2.1 and the GPL v2, but not with version 3 of
 
 those licenses. So to combine the OpenCORE libraries with FFmpeg, the license
 
 version needs to be upgraded by passing --enable-version3 to configure.
 
 
-The nonfree external library libfaac can be hooked up in FFmpeg. You need to
 
-pass --enable-nonfree to configure to enable it. Employ this option with care
 
-as FFmpeg then becomes nonfree and unredistributable.
 
+The nonfree external libraries libfaac and libaacplus can be hooked up in FFmpeg.
 
+You need to pass --enable-nonfree to configure to enable it. Employ this option
 
+with care as FFmpeg then becomes nonfree and unredistributable.

+ 1 - 1
MAINTAINERS
View File 

@@ -19,7 +19,7 @@ ffmpeg:
 
   ffmpeg.c                              Michael Niedermayer
 
 
 ffplay:
 
-  ffplay.c                              Michael Niedermayer
 
+  ffplay.c                              Marton Balint
 
 
 ffprobe:
 
   ffprobe.c                             Stefano Sabatini

+ 1 - 1
VERSION
View File 

@@ -1 +1 @@
 
-0.7.5
 
+0.7.7

+ 18 - 3
configure
View File 

@@ -162,6 +162,7 @@ External library support:
 
   --enable-bzlib           enable bzlib [autodetect]
 
   --enable-libcelt         enable CELT/Opus decoding via libcelt [no]
 
   --enable-frei0r          enable frei0r video filtering
 
+  --enable-libaacplus      enable AAC+ encoding via libaacplus [no]
 
   --enable-libopencore-amrnb enable AMR-NB de/encoding via libopencore-amrnb [no]
 
   --enable-libopencore-amrwb enable AMR-WB decoding via libopencore-amrwb [no]
 
   --enable-libopencv       enable video filtering via libopencv [no]
 
@@ -929,6 +930,8 @@ CONFIG_LIST="
 
     h264pred
 
     hardcoded_tables
 
     huffman
 
+    libaacplus
 
+    libcdio
 
     libcelt
 
     libdc1394
 
     libdirac
 
@@ -1406,6 +1409,7 @@ vdpau_deps="vdpau_vdpau_h vdpau_vdpau_x11_h"
 
 h264_parser_select="golomb h264dsp h264pred"
 
 
 # external libraries
 
+libaacplus_encoder_deps="libaacplus"
 
 libcelt_decoder_deps="libcelt"
 
 libdirac_decoder_deps="libdirac !libschroedinger"
 
 libdirac_encoder_deps="libdirac"
 
@@ -1539,11 +1543,14 @@ test_deps(){
 
         dep=${v%=*}
 
         tests=${v#*=}
 
         for name in ${tests}; do
 
-            eval ${name}_test_deps="'${dep}$suf1 ${dep}$suf2'"
 
+            append ${name}_test_deps ${dep}$suf1 ${dep}$suf2
 
         done
 
     done
 
 }
 
 
+mxf_d10_test_deps="avfilter"
 
+seek_lavf_mxf_d10_test_deps="mxf_d10_test"
 
+
 
 test_deps _encoder _decoder                                             \
 
     adpcm_g726=g726                                                     \
 
     adpcm_ima_qt                                                        \
 
@@ -2191,7 +2198,7 @@ case "$arch" in
 
         arch="sparc"
 
         subarch="sparc64"
 
     ;;
 
-    i[3-6]86|i86pc|BePC|x86pc|x86_64|amd64)
 
+    i[3-6]86|i86pc|BePC|x86pc|x86_64|x86_32|amd64)
 
         arch="x86"
 
     ;;
 
 esac
 
@@ -2582,6 +2589,7 @@ die_license_disabled gpl libxavs
 
 die_license_disabled gpl libxvid
 
 die_license_disabled gpl x11grab
 
 
+die_license_disabled nonfree libaacplus
 
 die_license_disabled nonfree libfaac
 
 
 die_license_disabled version3 libopencore_amrnb
 
@@ -2900,6 +2908,7 @@ check_mathfunc truncf
 
 enabled avisynth   && require2 vfw32 "windows.h vfw.h" AVIFileInit -lavifil32
 
 enabled libcelt    && require libcelt celt/celt.h celt_decode -lcelt0
 
 enabled frei0r     && { check_header frei0r.h || die "ERROR: frei0r.h header not found"; }
 
+enabled libaacplus && require  "libaacplus >= 2.0.0" aacplus.h aacplusEncOpen -laacplus
 
 enabled libdc1394  && require_pkg_config libdc1394-2 dc1394/dc1394.h dc1394_new
 
 enabled libdirac   && require_pkg_config dirac                          \
 
     "libdirac_decoder/dirac_parser.h libdirac_encoder/dirac_encoder.h"  \
 
@@ -3065,6 +3074,10 @@ else
 
 fi
 
 check_cflags -fno-math-errno
 
 check_cflags -fno-signed-zeros
 
+check_cc -mno-red-zone <<EOF && noredzone_flags="-mno-red-zone"
 
+int x;
 
+EOF
 
+
 
 
 if enabled icc; then
 
     # Just warnings, no remarks
 
@@ -3143,7 +3156,7 @@ check_deps $CONFIG_LIST       \
 
 
 enabled asm || { arch=c; disable $ARCH_LIST $ARCH_EXT_LIST; }
 
 
-if test $target_os == "haiku"; then
 
+if test $target_os = "haiku"; then
 
     disable memalign
 
     disable posix_memalign
 
 fi
 
@@ -3217,6 +3230,7 @@ echo "frei0r enabled            ${frei0r-no}"
 
 echo "libdc1394 support         ${libdc1394-no}"
 
 echo "libdirac enabled          ${libdirac-no}"
 
 echo "libfaac enabled           ${libfaac-no}"
 
+echo "libaacplus enabled        ${libaacplus-no}"
 
 echo "libgsm enabled            ${libgsm-no}"
 
 echo "libmp3lame enabled        ${libmp3lame-no}"
 
 echo "libnut enabled            ${libnut-no}"
 
@@ -3343,6 +3357,7 @@ SLIB_INSTALL_LINKS=${SLIB_INSTALL_LINKS}
 
 SLIB_INSTALL_EXTRA_LIB=${SLIB_INSTALL_EXTRA_LIB}
 
 SLIB_INSTALL_EXTRA_SHLIB=${SLIB_INSTALL_EXTRA_SHLIB}
 
 SAMPLES:=${samples:-\$(FATE_SAMPLES)}
 
+NOREDZONE_FLAGS=$noredzone_flags
 
 EOF
 
 
 get_version(){

+ 3 - 3
doc/filters.texi
View File 

@@ -1769,7 +1769,7 @@ It accepts the following parameters:
 
 
 Negative values for the amount will blur the input video, while positive
 
 values will sharpen. All parameters are optional and default to the
 
-equivalent of the string '5:5:1.0:0:0:0.0'.
 
+equivalent of the string '5:5:1.0:5:5:0.0'.
 
 
 @table @option
 
 
@@ -1787,11 +1787,11 @@ and 5.0, default value is 1.0.
 
 
 @item chroma_msize_x
 
 Set the chroma matrix horizontal size. It can be an integer between 3
 
-and 13, default value is 0.
 
+and 13, default value is 5.
 
 
 @item chroma_msize_y
 
 Set the chroma matrix vertical size. It can be an integer between 3
 
-and 13, default value is 0.
 
+and 13, default value is 5.
 
 
 @item luma_amount
 
 Set the chroma effect strength. It can be a float number between -2.0

+ 3 - 1
doc/general.texi
View File 

@@ -543,6 +543,8 @@ following image formats are supported:
 
 @multitable @columnfractions .4 .1 .1 .4
 
 @item Name @tab Encoding @tab Decoding @tab Comments
 
 @item 8SVX audio             @tab     @tab  X
 
+@item AAC+                   @tab  E  @tab  X
 
+    @tab encoding supported through external library libaacplus
 
 @item AAC                    @tab  E  @tab  X
 
     @tab encoding supported through external library libfaac and libvo-aacenc
 
 @item AC-3                   @tab IX  @tab  X
 
@@ -1088,7 +1090,7 @@ These library packages are only available from
 
 @uref{http://sourceware.org/cygwinports/, Cygwin Ports}:
 
 
 @example
 
-yasm, libSDL-devel, libdirac-devel, libfaac-devel, libgsm-devel,
 
+yasm, libSDL-devel, libdirac-devel, libfaac-devel, libaacplus-devel, libgsm-devel,
 
 libmp3lame-devel, libschroedinger1.0-devel, speex-devel, libtheora-devel,
 
 libxvidcore-devel
 
 @end example

+ 2 - 2
ffmpeg.c
View File 

@@ -2411,9 +2411,9 @@ static int transcode(AVFormatContext **output_files,
 
             }
 
         }
 
         if(codec->codec_type == AVMEDIA_TYPE_VIDEO){
 
-            /* maximum video buffer size is 6-bytes per pixel, plus DPX header size */
 
+            /* maximum video buffer size is 6-bytes per pixel, plus DPX header size (1664)*/
 
             int size= codec->width * codec->height;
 
-            bit_buffer_size= FFMAX(bit_buffer_size, 6*size + 1664);
 
+            bit_buffer_size= FFMAX(bit_buffer_size, 7*size + 10000);
 
         }
 
     }

+ 78 - 20
libavcodec/4xm.c
View File 

@@ -133,7 +133,9 @@ typedef struct FourXContext{
 
     GetBitContext pre_gb;          ///< ac/dc prefix
 
     GetBitContext gb;
 
     const uint8_t *bytestream;
 
+    const uint8_t *bytestream_end;
 
     const uint16_t *wordstream;
 
+    const uint16_t *wordstream_end;
 
     int mv[256];
 
     VLC pre_vlc;
 
     int last_dc;
 
@@ -277,7 +279,7 @@ static void init_mv(FourXContext *f){
 
     }
 
 #endif
 
 
-static inline void mcdc(uint16_t *dst, uint16_t *src, int log2w, int h, int stride, int scale, int dc){
 
+static inline void mcdc(uint16_t *dst, uint16_t *src, int log2w, int h, int stride, int scale, unsigned dc){
 
    int i;
 
    dc*= 0x10001;
 
 
@@ -328,6 +330,10 @@ static void decode_p_block(FourXContext *f, uint16_t *dst, uint16_t *src, int lo
 
     assert(code>=0 && code<=6);
 
 
     if(code == 0){
 
+        if (f->bytestream_end - f->bytestream < 1){
 
+            av_log(f->avctx, AV_LOG_ERROR, "bytestream overread\n");
 
+            return;
 
+        }
 
         src += f->mv[ *f->bytestream++ ];
 
         if(start > src || src > end){
 
             av_log(f->avctx, AV_LOG_ERROR, "mv out of pic\n");
 
@@ -345,15 +351,31 @@ static void decode_p_block(FourXContext *f, uint16_t *dst, uint16_t *src, int lo
 
     }else if(code == 3 && f->version<2){
 
         mcdc(dst, src, log2w, h, stride, 1, 0);
 
     }else if(code == 4){
 
+        if (f->bytestream_end - f->bytestream < 1){
 
+            av_log(f->avctx, AV_LOG_ERROR, "bytestream overread\n");
 
+            return;
 
+        }
 
         src += f->mv[ *f->bytestream++ ];
 
         if(start > src || src > end){
 
             av_log(f->avctx, AV_LOG_ERROR, "mv out of pic\n");
 
             return;
 
         }
 
+        if (f->wordstream_end - f->wordstream < 1){
 
+            av_log(f->avctx, AV_LOG_ERROR, "wordstream overread\n");
 
+            return;
 
+        }
 
         mcdc(dst, src, log2w, h, stride, 1, av_le2ne16(*f->wordstream++));
 
     }else if(code == 5){
 
+        if (f->wordstream_end - f->wordstream < 1){
 
+            av_log(f->avctx, AV_LOG_ERROR, "wordstream overread\n");
 
+            return;
 
+        }
 
         mcdc(dst, src, log2w, h, stride, 0, av_le2ne16(*f->wordstream++));
 
     }else if(code == 6){
 
+        if (f->wordstream_end - f->wordstream < 2){
 
+            av_log(f->avctx, AV_LOG_ERROR, "wordstream overread\n");
 
+            return;
 
+        }
 
         if(log2w){
 
             dst[0] = av_le2ne16(*f->wordstream++);
 
             dst[1] = av_le2ne16(*f->wordstream++);
 
@@ -375,6 +397,8 @@ static int decode_p_frame(FourXContext *f, const uint8_t *buf, int length){
 
 
     if(f->version>1){
 
         extra=20;
 
+        if (length < extra)
 
+            return -1;
 
         bitstream_size= AV_RL32(buf+8);
 
         wordstream_size= AV_RL32(buf+12);
 
         bytestream_size= AV_RL32(buf+16);
 
@@ -385,11 +409,10 @@ static int decode_p_frame(FourXContext *f, const uint8_t *buf, int length){
 
         bytestream_size= FFMAX(length - bitstream_size - wordstream_size, 0);
 
     }
 
 
-    if(bitstream_size+ bytestream_size+ wordstream_size + extra != length
 
-       || bitstream_size  > (1<<26)
 
-       || bytestream_size > (1<<26)
 
-       || wordstream_size > (1<<26)
 
-       ){
 
+    if (bitstream_size > length ||
 
+        bytestream_size > length - bitstream_size ||
 
+        wordstream_size > length - bytestream_size - bitstream_size ||
 
+        extra > length - bytestream_size - bitstream_size - wordstream_size){
 
         av_log(f->avctx, AV_LOG_ERROR, "lengths %d %d %d %d\n", bitstream_size, bytestream_size, wordstream_size,
 
         bitstream_size+ bytestream_size+ wordstream_size - length);
 
         return -1;
 
@@ -399,10 +422,13 @@ static int decode_p_frame(FourXContext *f, const uint8_t *buf, int length){
 
     if (!f->bitstream_buffer)
 
         return AVERROR(ENOMEM);
 
     f->dsp.bswap_buf(f->bitstream_buffer, (const uint32_t*)(buf + extra), bitstream_size/4);
 
+    memset((uint8_t*)f->bitstream_buffer + bitstream_size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
 
     init_get_bits(&f->gb, f->bitstream_buffer, 8*bitstream_size);
 
 
     f->wordstream= (const uint16_t*)(buf + extra + bitstream_size);
 
+    f->wordstream_end= f->wordstream + wordstream_size/2;
 
     f->bytestream= buf + extra + bitstream_size + wordstream_size;
 
+    f->bytestream_end = f->bytestream + bytestream_size;
 
 
     init_mv(f);
 
 
@@ -531,7 +557,7 @@ static int decode_i_mb(FourXContext *f){
 
     return 0;
 
 }
 
 
-static const uint8_t *read_huffman_tables(FourXContext *f, const uint8_t * const buf){
 
+static const uint8_t *read_huffman_tables(FourXContext *f, const uint8_t * const buf, int buf_size){
 
     int frequency[512];
 
     uint8_t flag[512];
 
     int up[512];
 
@@ -539,6 +565,7 @@ static const uint8_t *read_huffman_tables(FourXContext *f, const uint8_t * const
 
     int bits_tab[257];
 
     int start, end;
 
     const uint8_t *ptr= buf;
 
+    const uint8_t *ptr_end = buf + buf_size;
 
     int j;
 
 
     memset(frequency, 0, sizeof(frequency));
 
@@ -549,6 +576,8 @@ static const uint8_t *read_huffman_tables(FourXContext *f, const uint8_t * const
 
     for(;;){
 
         int i;
 
 
+        if (start <= end && ptr_end - ptr < end - start + 1 + 1)
 
+            return NULL;
 
         for(i=start; i<=end; i++){
 
             frequency[i]= *ptr++;
 
         }
 
@@ -601,9 +630,10 @@ static const uint8_t *read_huffman_tables(FourXContext *f, const uint8_t * const
 
         len_tab[j]= len;
 
     }
 
 
-    init_vlc(&f->pre_vlc, ACDC_VLC_BITS, 257,
 
-             len_tab , 1, 1,
 
-             bits_tab, 4, 4, 0);
 
+    if (init_vlc(&f->pre_vlc, ACDC_VLC_BITS, 257,
 
+                 len_tab , 1, 1,
 
+                 bits_tab, 4, 4, 0))
 
+        return NULL;
 
 
     return ptr;
 
 }
 
@@ -621,10 +651,13 @@ static int decode_i2_frame(FourXContext *f, const uint8_t *buf, int length){
 
     const int height= f->avctx->height;
 
     uint16_t *dst= (uint16_t*)f->current_picture.data[0];
 
     const int stride= f->current_picture.linesize[0]>>1;
 
+    const uint8_t *buf_end = buf + length;
 
 
     for(y=0; y<height; y+=16){
 
         for(x=0; x<width; x+=16){
 
             unsigned int color[4], bits;
 
+            if (buf_end - buf < 8)
 
+                return -1;
 
             memset(color, 0, sizeof(color));
 
 //warning following is purely guessed ...
 
             color[0]= bytestream_get_le16(&buf);
 
@@ -658,18 +691,23 @@ static int decode_i_frame(FourXContext *f, const uint8_t *buf, int length){
 
     uint16_t *dst= (uint16_t*)f->current_picture.data[0];
 
     const int stride= f->current_picture.linesize[0]>>1;
 
     const unsigned int bitstream_size= AV_RL32(buf);
 
-    const int token_count av_unused = AV_RL32(buf + bitstream_size + 8);
 
-    unsigned int prestream_size= 4*AV_RL32(buf + bitstream_size + 4);
 
-    const uint8_t *prestream= buf + bitstream_size + 12;
 
+    unsigned int prestream_size;
 
+    const uint8_t *prestream;
 
+
 
+    if (bitstream_size > (1<<26) || length < bitstream_size + 12)
 
+        return -1;
 
+    prestream_size = 4*AV_RL32(buf + bitstream_size + 4);
 
+    prestream = buf + bitstream_size + 12;
 
 
-    if(prestream_size + bitstream_size + 12 != length
 
-       || bitstream_size > (1<<26)
 
-       || prestream_size > (1<<26)){
 
+    if (prestream_size > (1<<26) ||
 
+        prestream_size != length - (bitstream_size + 12)){
 
         av_log(f->avctx, AV_LOG_ERROR, "size mismatch %d %d %d\n", prestream_size, bitstream_size, length);
 
         return -1;
 
     }
 
 
-    prestream= read_huffman_tables(f, prestream);
 
+    prestream= read_huffman_tables(f, prestream, buf + length - prestream);
 
+    if (!prestream)
 
+        return -1;
 
 
     init_get_bits(&f->gb, buf + 4, 8*bitstream_size);
 
 
@@ -679,6 +717,7 @@ static int decode_i_frame(FourXContext *f, const uint8_t *buf, int length){
 
     if (!f->bitstream_buffer)
 
         return AVERROR(ENOMEM);
 
     f->dsp.bswap_buf(f->bitstream_buffer, (const uint32_t*)prestream, prestream_size/4);
 
+    memset((uint8_t*)f->bitstream_buffer + prestream_size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
 
     init_get_bits(&f->pre_gb, f->bitstream_buffer, 8*prestream_size);
 
 
     f->last_dc= 0*128*8*8;
 
@@ -710,6 +749,8 @@ static int decode_frame(AVCodecContext *avctx,
 
     AVFrame *p, temp;
 
     int i, frame_4cc, frame_size;
 
 
+    if (buf_size < 12)
 
+        return AVERROR_INVALIDDATA;
 
     frame_4cc= AV_RL32(buf);
 
     if(buf_size != AV_RL32(buf+4)+8 || buf_size < 20){
 
         av_log(f->avctx, AV_LOG_ERROR, "size mismatch %d %d\n", buf_size, AV_RL32(buf+4));
 
@@ -722,6 +763,11 @@ static int decode_frame(AVCodecContext *avctx,
 
         const int whole_size= AV_RL32(buf+16);
 
         CFrameBuffer *cfrm;
 
 
+        if (data_size < 0 || whole_size < 0){
 
+            av_log(f->avctx, AV_LOG_ERROR, "sizes invalid\n");
 
+            return AVERROR_INVALIDDATA;
 
+        }
 
+
 
         for(i=0; i<CFRAME_BUFFER_COUNT; i++){
 
             if(f->cfrm[i].id && f->cfrm[i].id < avctx->frame_number)
 
                 av_log(f->avctx, AV_LOG_ERROR, "lost c frame %d\n", f->cfrm[i].id);
 
@@ -738,6 +784,8 @@ static int decode_frame(AVCodecContext *avctx,
 
         }
 
         cfrm= &f->cfrm[i];
 
 
+        if (data_size > UINT_MAX -  cfrm->size - FF_INPUT_BUFFER_PADDING_SIZE)
 
+            return AVERROR_INVALIDDATA;
 
         cfrm->data= av_fast_realloc(cfrm->data, &cfrm->allocated_size, cfrm->size + data_size + FF_INPUT_BUFFER_PADDING_SIZE);
 
         if(!cfrm->data){ //explicit check needed as memcpy below might not catch a NULL
 
             av_log(f->avctx, AV_LOG_ERROR, "realloc falure");
 
@@ -781,12 +829,16 @@ static int decode_frame(AVCodecContext *avctx,
 
 
     if(frame_4cc == AV_RL32("ifr2")){
 
         p->pict_type= AV_PICTURE_TYPE_I;
 
-        if(decode_i2_frame(f, buf-4, frame_size) < 0)
 
+        if(decode_i2_frame(f, buf-4, frame_size+4) < 0){
 
+            av_log(f->avctx, AV_LOG_ERROR, "decode i2 frame failed\n");
 
             return -1;
 
+        }
 
     }else if(frame_4cc == AV_RL32("ifrm")){
 
         p->pict_type= AV_PICTURE_TYPE_I;
 
-        if(decode_i_frame(f, buf, frame_size) < 0)
 
+        if(decode_i_frame(f, buf, frame_size) < 0){
 
+            av_log(f->avctx, AV_LOG_ERROR, "decode i frame failed\n");
 
             return -1;
 
+        }
 
     }else if(frame_4cc == AV_RL32("pfrm") || frame_4cc == AV_RL32("pfr2")){
 
         if(!f->last_picture.data[0]){
 
             f->last_picture.reference= 1;
 
@@ -797,8 +849,10 @@ static int decode_frame(AVCodecContext *avctx,
 
         }
 
 
         p->pict_type= AV_PICTURE_TYPE_P;
 
-        if(decode_p_frame(f, buf, frame_size) < 0)
 
+        if(decode_p_frame(f, buf, frame_size) < 0){
 
+            av_log(f->avctx, AV_LOG_ERROR, "decode p frame failed\n");
 
             return -1;
 
+        }
 
     }else if(frame_4cc == AV_RL32("snd_")){
 
         av_log(avctx, AV_LOG_ERROR, "ignoring snd_ chunk length:%d\n", buf_size);
 
     }else{
 
@@ -831,6 +885,10 @@ static av_cold int decode_init(AVCodecContext *avctx){
 
         av_log(avctx, AV_LOG_ERROR, "extradata wrong or missing\n");
 
         return 1;
 
     }
 
+    if((avctx->width % 16) || (avctx->height % 16)) {
 
+        av_log(avctx, AV_LOG_ERROR, "unsupported width/height\n");
 
+        return AVERROR_INVALIDDATA;
 
+    }
 
 
     avcodec_get_frame_defaults(&f->current_picture);
 
     avcodec_get_frame_defaults(&f->last_picture);

Some files were not shown because too many files changed in this diff