6a507ccfe5
wtvenc: add some asserts because iam paranoid
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2011-09-14 01:08:01 +02:00
438debd095
WTV muxer (2_wtvenc.patch, 3_add_wtv_muxer.patch)
2011-09-14 00:41:25 +02:00
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
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
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
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
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
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
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
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
47886e3644
mxfdec: skip to end of structural sets This fixes reading of partition packs. The code stops reading after the operational pattern and should skip the array of essence container labels that follow
2011-09-12 18:17:49 +02:00
47a8589f7b
smacker demuxer: handle possible av_realloc() failure.
...
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2011-09-12 15:51:21 +02:00
7e4111cfe2
rmdec: Check return value of more avio_seek calls
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2011-09-12 04:39:13 +02:00
f9e083a156
avidec: Check return value of more avio_seek calls
...
The move of avio_seek in avi_read_seek is to avoiding modifying
state if the seek would fail.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2011-09-12 04:39:12 +02:00
ac1d489320
asf: Check return value of more avio_seek calls
...
This reduces problems when underlying protocol is not
seekable even if marked as such or if the file has been
cut short.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2011-09-12 04:39:12 +02:00
bc851a2946
Fix writes out of bounds in the ogg demuxer.
...
Between ogg_save() and ogg_restore() calls, the number of streams
could have been reduced.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2011-09-12 04:39:12 +02:00
411cc5c46a
Merge remote-tracking branch 'qatar/master'
...
* qatar/master: (31 commits)
audioconvert: add explanatory comments to channel_names array
audioconvert: K&R whitespace cosmetics
avconv: use correct index when selecting metadata to write to.
avconv: fix inverted variable
doc/avconv: document option types (input/output/per-stream/...)
doc/avtools-common-opts: write a section about stream specifiers.
doc/avconv: remove two pointless paragraphs.
doc/avconv: document that global options should be specified first.
doc/avconv: remove entries for nonexistent options
doc/avconv: remove documentation for removed 'timestamp' option
doc: cosmetics, rename fftools-common-opts to avtools-....
avconv: move streamid_map to options context.
avconv: extend -vf syntax
avconv: move top_field_first to options context.
avconv: move inter/intra matrix to options context.
avconv: remove -psnr option.
avconv: remove me_threshold option.
avconv: move video_rc_override_string to options context.
avconv: move frame pixel format to the options context.
avconv: move frame aspect ratio to the options context.
...
Conflicts:
avconv.c
cmdutils_common_opts.h
doc/avconv.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2011-09-12 00:32:54 +02:00
d0121e8d96
Fixed segfault on corrupted smacker streams in the demuxer.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2011-09-11 21:19:45 +02:00
1632a576e6
Fixed segfault on memory allocation failure in ape demuxer.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2011-09-11 21:19:45 +02:00
c8ce2b0a1d
mpegts: When playing mpegts over rtp/rtsp/sdp, lavf must still read PAT/SDT to get available streams
...
The code path using for mpegts over rtp doesn't open the demuxer using
mpegts_read_header,
so it never starts listening for PAT/SDT, only uses auto_guess
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2011-09-11 20:21:47 +02:00
53f8f0a70e
Fix for some non interleaved avi files that gets played twice or won't end
...
This changes so we assume EOF when we can't find the next
streams index entry for non interleaved file.
http://trac.xbmc.org/ticket/5585
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2011-09-11 18:21:07 +02:00
e42a3dd123
Allow reading of growing avi files (ie currently being written)
...
This uses the RIFF header stored size to figure out the expected AVI file size, instead
of the actual file. To work fully it requires handling failed avio_seek() instead
of assuming they always succeed.
Some fate file has been cut off and contains half a frame at the end which previously
was not output during demuxing. This frame is now output to encoder, thus fate
diff update.
2011-09-11 17:44:20 +02:00
f1f15c3c1a
mpegts: improve error reporting
...
When reporting continuity error show pid, expected and received cc.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2011-09-11 09:27:13 -04:00
162f1fbc14
mpegts: on seek, reset the cc for all PIDs
...
Prevent false positive continuity counter error logs.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2011-09-11 09:26:21 -04:00
cb66db8010
mpegts: update comment to match code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2011-09-11 00:55:16 +02:00
6796b82407
libavformat/utils: Only require first packet to be known for all audio and video streams
...
It can take a long time before subtitles or data streams show up,
so we shouldn't wait for those before assuming we have all info
for streams.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2011-09-11 00:33:20 +02:00
6d40f88cab
mpegts: Some additional HDMV types and reg descriptors for mpegts
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2011-09-10 22:10:00 +02:00
b10ba1175d
avisynth: Fix upside down bug
2011-09-10 05:24:39 +02:00
4f123a7d7c
avisynth: Remove wrong pts calculation.
...
Fixes Ticket428
2011-09-10 05:24:26 +02:00
e5e0580b93
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: Michael Niedermayer <michaelni@gmx.at >
2011-09-10 00:26:48 +02:00
6dcbbe34e8
av_interleave_packet_per_dts: switch noninterleaved flushing logic to max dts.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2011-09-09 17:19:54 +02:00
8096b7c67f
asfenc: fix assert failure on long ffserver runs
2011-09-09 03:34:27 +02:00
d64066f6e8
Prevent double free of side_data when AVFMT_FLAG_KEEP_SIDE_DATA flag is set
2011-09-08 23:47:23 +02:00
78d7d8fe91
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
Employ FF_ARRAY_ELEMS instead of manually calculating array length.
Fixed invalid access in wavpack decoder on corrupted bitstream.
Fixed invalid writes in wavpack decoder on corrupted bitstreams.
Fixed invalid access in wavpack decoder on corrupted extra bits sub-blocks.
rtpdec_asf: Fix integer underflow that could allow remote code execution
Conflicts:
libavformat/rtpdec_asf.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2011-09-08 22:37:31 +02:00
8ba987bff3
ffmdec: set avio buffer to ffm->packet_size, avoid dirty reads
2011-09-08 20:53:44 +02:00
0b99e858d1
ffmdec: fix seeking for non indexed files
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2011-09-08 20:53:37 +02:00
59810f8388
ffmdec: handle wrapped file in ffm_seek
2011-09-08 20:09:40 +02:00
6376362d15
Employ FF_ARRAY_ELEMS instead of manually calculating array length.
2011-09-08 15:57:14 +02:00
f6e99bf514
Add loas as an extension for LOAS/LATM.
2011-09-08 08:24:17 +02:00
c1fcd7e1ab
Support remuxing aac_latm.
2011-09-08 08:22:50 +02:00
42d4df06e1
WTV muxer (1_extract_wtv_common_code.patch)
2011-09-08 01:55:07 +02:00
bcc531f04a
flvdec: Remove AVFMTCTX_NOHEADER if both flags and metadata claim 1 stream
...
If there is only 1 stream in an flv avformat_find_stream_info will continually
read until probesize is reached. This should stop it reading if the metadata
also claims there to be 1 stream.
2011-09-08 00:26:28 +02:00
f1b5693027
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
Add LATM muxer
v210enc: clip values according to specifications
v210enc: switch to PIX_FMT_422P10
v210dec: switch to PIX_FMT_422P10
AVOptions: remove AVOption.offset <= 0 checks
AVOptions: deprecate av_opt_set_defaults2
AVOptions: move doxy for av_opt_set_defaults() from opt.c to opt.h
libx264: fix setting some more parameters
libx264: fix setting the H.264 level
libx264: add 'direct-pred' private option
libx264: add 'partitions' private option
Conflicts:
Changelog
libavcodec/Makefile
libavcodec/libx264.c
libavcodec/v210enc.c
libavfilter/src_movie.c
libavformat/version.h
libavutil/opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2011-09-07 22:58:39 +02:00
5ea091fb5a
rtpdec_asf: Fix integer underflow that could allow remote code execution
...
Fixes MSVR-11-0088.
Credit: Jeong Wook Oh of Microsoft and Microsoft Vulnerability Research (MSVR)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
Signed-off-by: Martin Storsjö <martin@martin.st >
2011-09-07 23:33:53 +03:00
a2b66a366d
rtpdec_asf: fix memleak
...
Based on a suggestion by Ronald S. Bultje
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2011-09-07 16:48:49 +02:00
ba9a7e0d71
rtp: Fix integer underflow that could allow remote code execution.
...
Fixes MSVR-11-0088
Credit: Jeong Wook Oh of Microsoft and Microsoft Vulnerability Research (MSVR)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2011-09-07 14:59:39 +02:00
0ca36b4de7
Add LATM muxer
...
Signed-off-by: Janne Grunau <janne-libav@jannau.net >
2011-09-07 12:57:55 +02:00
9c684feadc
libx264: add 'direct-pred' private option
...
Deprecate AVCodecContext.directpred
2011-09-07 07:27:55 +02:00
0635a8aa21
libx264: add 'partitions' private option
...
Deprecate AVCodecContext.partitions.
2011-09-07 07:27:18 +02:00
0078430e30
flvdec: A little bit of cleanup
2011-09-07 02:38:57 +02:00
Michael Niedermayer