x/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-08-07 14:28:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,676 Commits 40 Branches 430 Tags
eac673d506eaefc29b0fc74b5043e41a2bf0967d
Commit Graph
8264 Commits
Author SHA1 Message Date
Michael Niedermayer 9a9ceb8776 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavfi: add select filter
  oggdec: fix out of bound write in the ogg demuxer
  movenc: create an alternate group for each media type
  lavd: add libcdio-paranoia input device for audio CD grabbing
  rawdec: refactor private option for raw video demuxers
  pcmdec: use unique classes for all pcm demuxers.
  rawdec: g722 is always 1 channel/16kHz

Conflicts:
	Changelog
	configure
	doc/filters.texi
	libavdevice/avdevice.h
	libavfilter/avfilter.h
	libavfilter/vf_select.c
	tests/ref/lavf/mov

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-17 22:36:43 +02:00
Laurent AimarandLuca Barbato 0e7efb9d23 oggdec: fix out of bound write in the ogg demuxer 
Between ogg_save() and ogg_restore() calls, the number of streams
could have been reduced.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-09-17 09:41:02 -07:00
Laurent AimarandMichael Niedermayer 4907f81358 Reject audio tracks with invalid interleaver parameters in RM demuxer. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-17 18:26:53 +02:00
Anton Khirnov 7574cacbd5 movenc: create an alternate group for each media type 
Partially fixes bug 44.
 2011-09-17 08:42:30 +02:00
Anton Khirnov 85d982f1e2 rawdec: refactor private option for raw video demuxers 
pixel_format/video_size only apply to 'rawvideo' (==uncompressed) demuxer
and make no sense for the other raw (== containerless) demuxers. Keep
only the framerate option for those.

Also use unique classes for all raw video demuxers
 2011-09-17 06:43:09 +02:00
Anton Khirnov 34d2bf30a0 pcmdec: use unique classes for all pcm demuxers. 2011-09-17 06:42:32 +02:00
Anton Khirnov d906f49aa8 rawdec: g722 is always 1 channel/16kHz 2011-09-17 06:42:17 +02:00
Michael Niedermayer 5c5306df96 lavf/utils: rewrite real fps calculation code. 
The new code is free of biasing to the first timestamps
Fixes fraps.fps.test.zip

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-16 21:29:58 +02:00
Daniel KristjanssonandMichael Niedermayer 4460b81f9e mxfenc: Add support for MPEG-2 MP@HL-14 in mxf container 
Support Main Profile at High 1440 Level in MXF container,
using essence coding label from SMPTE RDD 9, table 6.
 2011-09-16 18:16:30 +02:00
Peter RossandMichael Niedermayer 07a70caba7 Binary text decoder 
Decoder and demuxer for various binary text formats.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-16 05:53:14 +02:00
Michael Niedermayer 62101030c4 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  swscale: fix byte overreads in SSE-optimized hscale().
  matroskadec: fix typo.
  matroskadec: bail on parsing of incorrect seek index segments

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-15 23:10:26 +02:00
Michael Niedermayer e78d1a594a mpegts: make sure the "standard" code doesnt override the probing with NONE/DATA. 
Fixes video stream detection in vid_0x80.ts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-15 23:01:04 +02:00
Laurent AimarandAlex Converse b59efc9434 Fixed size given to init_get_bits(). 
init_get_bits() takes a number of bits and not a number of bytes as
its size argument.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
 2011-09-15 13:23:04 -07:00
Ingo BrücklandMichael Niedermayer 5d305c9398 Correct determination of file size and frames in VBRI headers 
The fields "Number of Bytes" and "Number of Frames" are mixed up. "Bytes"
come first, "Frames" behind.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-15 20:16:55 +02:00
Elvis Presley 5554de13b2 ProRes Decoder 
Signed-off-by: Elvis Presley <elvis@e.p>
 2011-09-15 15:58:56 +02:00
Dustin BrodyandAnton Khirnov d7d2f0e63c matroskadec: fix typo. 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-09-15 09:34:38 +02:00
Dustin BrodyandAnton Khirnov 4a9628f276 matroskadec: bail on parsing of incorrect seek index segments 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-09-15 09:34:16 +02:00
Michael Niedermayer 3ee83f4605 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavf utils: Remove write-only variable
  lavf utils: Rename shadowing variable
  smacker: fix a few off by 1 errors
  Check for invalid VLC value in smacker decoder.
  Check and propagate errors when VLC trees cannot be built in smacker decoder.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-14 21:57:47 +02:00
Joakim Plate cdced09ef6 Don't override duration from file header with bitrate duration 
This is most noticable on matroska files which has duration
as part of it's header.
 2011-09-14 20:08:43 +02:00
Joakim Plate 5d70536804 [yop] Check return value of avio_seek and avoid modifying state if it fails 2011-09-14 19:53:45 +02:00
Joakim Plate 7bcd81299a [wtv] Check return value of avio_seek and avoid modifying state if it fails 2011-09-14 19:53:45 +02:00
Joakim Plate d9d7174d70 [tta] Check return value of avio_seek and avoid modifying state if it fails 2011-09-14 19:53:45 +02:00
Joakim Plate fc12f54ea9 [tmv] Check return value of avio_seek and avoid modifying state if it fails 2011-09-14 19:53:45 +02:00
Joakim Plate 425907809b [r3d] Check return value of avio_seek and avoid modifying state if it fails 2011-09-14 19:53:45 +02:00
Joakim Plate e22155ef0e [nsv] Check return value of avio_seek and avoid modifying state if it fails 2011-09-14 19:53:45 +02:00
Joakim Plate a3f4fc813d [mxfdec] Check return value of avio_seek and avoid modifying state if it fails 2011-09-14 19:53:45 +02:00
Joakim Plate 88ad79415c [mpc8] Check return value of avio_seek and avoid modifying state if it fails 2011-09-14 19:53:45 +02:00
Joakim Plate 833358172b [jvd] Check return value of avio_seek and avoid modifying state if it fails 2011-09-14 19:53:39 +02:00
Joakim Plate 58540d7bd3 [filmstrip] Check return value of avio_seek and avoid modifying state if it fails 2011-09-14 19:51:07 +02:00
Joakim Plate 928cfc7e4f [ffmdec] Check return value of avio_seek and avoid modifying state if it fails 2011-09-14 19:51:07 +02:00
Joakim Plate 1df00ac80f [dv] Check return value of avio_seek and avoid modifying state if it fails 2011-09-14 19:51:07 +02:00
Joakim Plate 75f418064e [cafdec] Check return value of avio_seek and avoid modifying state if it fails 2011-09-14 19:51:07 +02:00
Joakim Plate 598cc84fbf [bink] Check return value of avio_seek and avoid modifying state if it fails 2011-09-14 19:51:07 +02:00
Alex Converse 940173d4d1 lavf utils: Remove write-only variable 2011-09-14 10:35:46 -07:00
Alex Converse 4439caa482 lavf utils: Rename shadowing variable 2011-09-14 10:35:42 -07:00
elupusandMichael Niedermayer 9fa47cb773 make mpegts_get_pcr resync if it's not on a valid mpegts packet 2011-09-14 17:11:23 +02:00
elupusandMichael Niedermayer 6214266362 cosmetic reindent of mpegts_get_pcr 2011-09-14 17:11:07 +02:00
elupusandMichael Niedermayer 0a90b6a43e check return value of url_fseek in mpegts_get_pcr 2011-09-14 17:10:40 +02:00
elupusandMichael Niedermayer 880e83827f respect the maximum position mpegts_get_pcr is allowed to seek to 2011-09-14 17:09:56 +02:00
elupusandMichael Niedermayer 2130d2f594 remove unused code in mpegts_get_pcr 2011-09-14 17:08:43 +02:00
Michael Niedermayer 6a507ccfe5 wtvenc: add some asserts because iam paranoid 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-14 01:08:01 +02:00
zhentan fengandMichael Niedermayer 438debd095 WTV muxer (2_wtvenc.patch, 3_add_wtv_muxer.patch) 2011-09-14 00:41:25 +02:00
Michael Niedermayer 38670356f9 libavformat/utils: print ts in the "invalid dts/pts combination" case. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-13 06:42:13 +02:00
Laurent AimarandMartin Storsjö a92d0fa5d2 Fixed off by one packet size allocation in the smacker demuxer. 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-09-12 23:44:51 +03:00
Laurent AimarandMartin Storsjö e055932f56 Check for invalid packet size in the smacker demuxer. 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-09-12 23:43:52 +03:00
Joakim PlateandMichael Niedermayer 6c9a24636b asf: only try to read asf index once 
This avoid retrying to read ASF index in files for every
attempt to seek. This makes a big difference to protocols
with slow seeking (for example http)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-12 22:12:14 +02:00
Laurent AimarandMichael Niedermayer c58d45e004 segafilm: Fix potential division by 0 on corrupted segafilm streams in the demuxer. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-12 21:45:23 +02:00
Laurent AimarandMichael Niedermayer 7cbe025758 segafilm: Check for memory allocation failures in segafilm demuxer. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-12 21:45:07 +02:00
Laurent AimarandAnton Khirnov 273aab99bf ape demuxer: fix segfault on memory allocation failure. 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-09-12 21:12:31 +02:00
Michael Niedermayer 9765caec1b Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  adpcm: split ADPCM encoders and decoders into separate files.
  doc/avconv: fix typo.
  rv34: check that subsequent slices have the same type as first one.
  smacker demuxer: handle possible av_realloc() failure.
  lavfi: add split filter from soc.
  lavfi: add showinfo filter
  libxavs: add private options corresponding to deprecated global options

Conflicts:
	Changelog
	libavcodec/adpcm.c
	libavfilter/avfilter.h
	libavfilter/vf_showinfo.c
	libavfilter/vf_split.c
	libavformat/smacker.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-12 21:01:12 +02:00