OSDN Git Service
Michael Niedermayer [Tue, 11 Oct 2011 20:10:26 +0000 (22:10 +0200)]
examples/encoding: List more formats to make it more clear to the reader what is not handled in libavcodec.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Oct 2011 20:03:19 +0000 (22:03 +0200)]
mem: fix memalign hack av_realloc()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Oct 2011 18:09:53 +0000 (20:09 +0200)]
arm: fix av_clipl_int32() asm
Note, the other arm asm code is likely affected too and should be changed as well.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Tue, 11 Oct 2011 12:24:20 +0000 (14:24 +0200)]
ffmpeg: fix two stream related comments.
Michael Niedermayer [Tue, 11 Oct 2011 11:45:49 +0000 (13:45 +0200)]
g723.1: use memmove() where overlapping src and dst can happen.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Oct 2011 11:06:30 +0000 (13:06 +0200)]
vc1: enable interlaced p fields again, they seem no longer to crash with out of array writes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Oct 2011 09:56:42 +0000 (11:56 +0200)]
vc1: reset interlaced variables, prevent another bunch of crashes.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Sat, 8 Oct 2011 10:22:44 +0000 (12:22 +0200)]
eval: document recently added random(), hypot(), gcd().
Michael Niedermayer [Tue, 11 Oct 2011 01:42:51 +0000 (03:42 +0200)]
vc1: disable parts of the interlaced code due to security issues.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Oct 2011 00:39:50 +0000 (02:39 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master: (34 commits)
h264: reset h->ref_count in case of errors in ff_h264_decode_ref_pic_list_reordering()
error_resilience: fix the check for missing references in ff_er_frame_end() for H264
4xm: prevent NULL dereference with invalid huffman table
4xmdemux: prevent use of uninitialized memory
4xm: clear FF_INPUT_BUFFER_PADDING_SIZE bytes in temporary buffers
ptx: check for out of bound reads
tiffdec: fix out of bound reads/writes
eacmv: check for out of bound reads
eacmv: fix potential pointer arithmetic overflows
adpcm: fix out of bound reads due to integer overflow
anm: prevent infinite loop
avsdemux: check for out of bound writes
avs: check for out of bound reads
avsdemux: check for corrupted data
AVOptions: refactor set_number/write_number
AVOptions: cosmetics, rename static av_set_number2() to write_number().
AVOptions: cosmetics, move and rename static av_set_number().
AVOptions: split av_set_string3 into opt type-specific functions
avidec: fix signed overflow in avi_sync()
mxfdec: Fix some buffer overreads caused by the misuse of AVPacket related functions.
...
Conflicts:
Changelog
configure
libavcodec/ptx.c
libavcodec/ra144.c
libavcodec/vaapi_vc1.c
libavcodec/vc1.c
libavcodec/version.h
libavformat/4xm.c
libavformat/avidec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sat, 8 Oct 2011 22:38:34 +0000 (00:38 +0200)]
ffprobe: prefer lowercase section names over uppercase ones
This is consistent with chapter names. The default writer section names
are converted to uppercase for keeping backward compatibility.
Laurent Aimar [Sun, 2 Oct 2011 14:03:47 +0000 (14:03 +0000)]
h264: reset h->ref_count in case of errors in ff_h264_decode_ref_pic_list_reordering()
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Laurent Aimar [Sun, 2 Oct 2011 00:48:12 +0000 (00:48 +0000)]
error_resilience: fix the check for missing references in ff_er_frame_end() for H264
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Laurent Aimar [Sun, 2 Oct 2011 00:48:11 +0000 (00:48 +0000)]
4xm: prevent NULL dereference with invalid huffman table
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Laurent Aimar [Sun, 2 Oct 2011 00:48:11 +0000 (00:48 +0000)]
4xmdemux: prevent use of uninitialized memory
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Laurent Aimar [Sun, 2 Oct 2011 00:48:11 +0000 (00:48 +0000)]
4xm: clear FF_INPUT_BUFFER_PADDING_SIZE bytes in temporary buffers
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Laurent Aimar [Sun, 2 Oct 2011 00:48:12 +0000 (00:48 +0000)]
ptx: check for out of bound reads
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Laurent Aimar [Fri, 30 Sep 2011 23:42:33 +0000 (23:42 +0000)]
tiffdec: fix out of bound reads/writes
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Laurent Aimar [Fri, 30 Sep 2011 23:42:32 +0000 (23:42 +0000)]
eacmv: check for out of bound reads
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Laurent Aimar [Fri, 30 Sep 2011 23:42:32 +0000 (23:42 +0000)]
eacmv: fix potential pointer arithmetic overflows
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Laurent Aimar [Fri, 30 Sep 2011 23:42:32 +0000 (23:42 +0000)]
adpcm: fix out of bound reads due to integer overflow
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Laurent Aimar [Fri, 30 Sep 2011 23:42:32 +0000 (23:42 +0000)]
anm: prevent infinite loop
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Laurent Aimar [Fri, 30 Sep 2011 23:42:31 +0000 (23:42 +0000)]
avsdemux: check for out of bound writes
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Laurent Aimar [Fri, 30 Sep 2011 23:42:31 +0000 (23:42 +0000)]
avs: check for out of bound reads
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Laurent Aimar [Fri, 30 Sep 2011 23:42:31 +0000 (23:42 +0000)]
avsdemux: check for corrupted data
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Clément Bœsch [Mon, 10 Oct 2011 19:15:26 +0000 (21:15 +0200)]
libmodplug: do not call av_expr_parse() in case of no expr specified.
Clément Bœsch [Mon, 10 Oct 2011 19:09:30 +0000 (21:09 +0200)]
libmodplug: simpler and faster use of eval expr.
Anton Khirnov [Tue, 23 Aug 2011 10:58:49 +0000 (12:58 +0200)]
AVOptions: refactor set_number/write_number
write_number() does the actual writing of the supplied
number to destination. Move finding the option and choosing destination
address out of it.
Anton Khirnov [Tue, 23 Aug 2011 11:07:17 +0000 (13:07 +0200)]
AVOptions: cosmetics, rename static av_set_number2() to write_number().
Anton Khirnov [Tue, 23 Aug 2011 11:03:42 +0000 (13:03 +0200)]
AVOptions: cosmetics, move and rename static av_set_number().
Anton Khirnov [Tue, 23 Aug 2011 08:23:57 +0000 (10:23 +0200)]
AVOptions: split av_set_string3 into opt type-specific functions
Also stop attempting to honor the alloc parameter, as things break
horribly in that case.
It will be removed in upcoming successor to av_set_string3.
Mans Rullgard [Sat, 8 Oct 2011 00:51:37 +0000 (01:51 +0100)]
avidec: fix signed overflow in avi_sync()
Keeping byte values read from the file as unsigned is consistent
with how they are subsequently used and avoids an undefined left
shift by 24 when bit 7 is set.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Alex Converse [Sat, 8 Oct 2011 01:41:06 +0000 (18:41 -0700)]
mxfdec: Fix some buffer overreads caused by the misuse of AVPacket related functions.
Baptiste Coudurier [Sun, 26 Jun 2011 21:08:22 +0000 (14:08 -0700)]
dnxhddec: handle cid change in bitstream.
Kostya Shishkov [Mon, 10 Oct 2011 14:04:58 +0000 (16:04 +0200)]
vc1: K&R reformatting cosmetics
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Tomas Härdin [Fri, 7 Oct 2011 13:48:00 +0000 (15:48 +0200)]
mxfdec: Move FooterPartition to MXFContext and make sure it's never set to zero
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Justin Ruggles [Wed, 14 Sep 2011 18:46:50 +0000 (14:46 -0400)]
ra288: log an error message when output buffer is too small.
also return AVERROR(EINVAL) instead of -1.
Justin Ruggles [Wed, 14 Sep 2011 18:46:02 +0000 (14:46 -0400)]
ra288: use a more descriptive calculation for output data size
Justin Ruggles [Wed, 14 Sep 2011 18:42:31 +0000 (14:42 -0400)]
ra144: use macro constants to make the code more understandable.
Justin Ruggles [Wed, 14 Sep 2011 18:24:59 +0000 (14:24 -0400)]
ra144dec: log an error message when output buffer is too small.
also return AVERROR(EINVAL) instead of -1.
Justin Ruggles [Wed, 14 Sep 2011 18:24:02 +0000 (14:24 -0400)]
ra144dec: use a more descriptive calculation for output data size
Reimar Döffinger [Sat, 27 Aug 2011 17:27:07 +0000 (19:27 +0200)]
Support playing SMV files.
Audio and video are interleaved via stream cur_dts - no idea how
reliable this is.
It also cannot display the video properly - it is stored with
about 15 in a single JPEG frame, I cannot think of a reasonable
way to implement this.
Samples: http://samples.mplayerhq.hu/smv/
Format description: http://wiki.multimedia.cx/index.php?title=SMV
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Clément Bœsch [Fri, 7 Oct 2011 17:25:35 +0000 (19:25 +0200)]
libmodplug: add bintext video stream capability.
Clément Bœsch [Mon, 10 Oct 2011 13:54:09 +0000 (15:54 +0200)]
swresample: fix another broken indent chunk.
Also use a consistent style inside that block.
Michael Niedermayer [Mon, 10 Oct 2011 13:40:08 +0000 (15:40 +0200)]
mpegts: reduce av_log level for seek back to begin on unseekable protocols to info level.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mashiat Sarker Shakkhar [Thu, 6 Oct 2011 19:00:27 +0000 (00:00 +0500)]
lavc: Micro version bump for VC1 interlaced decoding support
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Mashiat Sarker Shakkhar [Thu, 6 Oct 2011 19:00:26 +0000 (00:00 +0500)]
vc1dec: interlaced stream decoding support 3/3
Cosmetics: break some lines and reformat TODOs
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Mashiat Sarker Shakkhar [Thu, 6 Oct 2011 19:00:25 +0000 (00:00 +0500)]
vc1dec: interlaced stream decoding support 2/3
Cosmetics: reformat some data tables in vc1data.c
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Mashiat Sarker Shakkhar [Thu, 6 Oct 2011 19:00:24 +0000 (00:00 +0500)]
vc1dec: interlaced stream decoding support 1/3
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Petter Ericson [Mon, 10 Oct 2011 12:22:11 +0000 (14:22 +0200)]
mpegts: Attempt to seek back to beginning in non-seekable mpegts files.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Gwenole Beauchesne [Mon, 10 Oct 2011 11:51:41 +0000 (13:51 +0200)]
vaapi: Fix VC-1 decoding (reconstruct bitstream TTFRM correctly).
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diego Biurrun [Mon, 10 Oct 2011 08:31:31 +0000 (10:31 +0200)]
configure: Add -Wstrict-prototypes to CFLAGS if available.
Janne Grunau [Mon, 10 Oct 2011 11:28:18 +0000 (13:28 +0200)]
avidec: simplify size parameter in memset()
Carl Eugen Hoyos [Mon, 10 Oct 2011 08:49:16 +0000 (10:49 +0200)]
Add G.723.1 to the documentation.
Carl Eugen Hoyos [Mon, 10 Oct 2011 08:25:07 +0000 (10:25 +0200)]
Bump minor for G.723.1 encoder and muxer.
Clément Bœsch [Mon, 10 Oct 2011 07:56:03 +0000 (09:56 +0200)]
swresample: fix broken indent.
Michael Niedermayer [Mon, 10 Oct 2011 01:41:49 +0000 (03:41 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpeg4dec: use unsigned type for startcode in ff_mpeg4_decode_picture_header
mpeg124: use sign_extend() function
ac3dec: use get_sbits() instead of manually sign-extending
4xm: fix signed overflow
wmavoice: fix a signed overflow
mpegvideo_enc: fix a signed overflow
crc: fix signed overflow
fate: run avconv with -nostats flag
avtools: add -v as alias for -loglevel
avconv: always print stats with AV_LOG_INFO
doc/avconv: add forgotten output/per-stream info to -filter
avconv: add -stats option to enable/disable printing encoding progress
avconv: in output_packet() don't set decoded_data_size for video.
avconv: remove pointless always true condition
avconv: factorize common code in transcode_init()
zmbv: remove memcpy() of decoded frame
mpeg12enc: use sign_extend() function
h264pred: use unsigned types for pixel values, fix signed overflows
h264: fix signed overflows in x*0x01010101 expressions
h264pred: remove unused variables
Conflicts:
avconv.c
tests/fate-run.sh
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Oct 2011 00:54:12 +0000 (02:54 +0200)]
reg tests: add g723.1
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mohamed Naufal [Mon, 10 Oct 2011 00:48:34 +0000 (02:48 +0200)]
g723.1 encoder
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mohamed Naufal [Mon, 10 Oct 2011 00:48:16 +0000 (02:48 +0200)]
g723.1 muxer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mans Rullgard [Sun, 9 Oct 2011 22:21:01 +0000 (23:21 +0100)]
mpeg4dec: use unsigned type for startcode in ff_mpeg4_decode_picture_header
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sun, 9 Oct 2011 22:16:07 +0000 (23:16 +0100)]
mpeg124: use sign_extend() function
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sun, 9 Oct 2011 22:15:17 +0000 (23:15 +0100)]
ac3dec: use get_sbits() instead of manually sign-extending
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sun, 9 Oct 2011 19:38:01 +0000 (20:38 +0100)]
4xm: fix signed overflow
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sun, 9 Oct 2011 19:46:22 +0000 (20:46 +0100)]
wmavoice: fix a signed overflow
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sun, 9 Oct 2011 19:32:58 +0000 (20:32 +0100)]
mpegvideo_enc: fix a signed overflow
Signed-off-by: Mans Rullgard <mans@mansr.com>
Carl Eugen Hoyos [Sun, 9 Oct 2011 20:58:31 +0000 (22:58 +0200)]
Do not auto-detect Sorenson Spark in f4v.
Assuming codec_tag H263 for FLV only leads to trouble.
Carl Eugen Hoyos [Sun, 9 Oct 2011 20:47:35 +0000 (22:47 +0200)]
Be less verbose about continuity check errors.
Michael Niedermayer [Sun, 9 Oct 2011 19:58:13 +0000 (21:58 +0200)]
prores: check slice mb_y against mb_height
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 9 Oct 2011 19:51:55 +0000 (21:51 +0200)]
prores: only call get_buffer once per frame
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 9 Oct 2011 19:51:06 +0000 (21:51 +0200)]
prores:cosmetics
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 9 Oct 2011 19:49:55 +0000 (21:49 +0200)]
prores: fix typo
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mans Rullgard [Sat, 8 Oct 2011 00:59:51 +0000 (01:59 +0100)]
crc: fix signed overflow
This fixes a signed overflow from i << 24 when i == 255 by
making i unsigned. The result of the shift is already
assigned to an variable of unsigned type.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Fri, 7 Oct 2011 13:13:02 +0000 (14:13 +0100)]
fate: run avconv with -nostats flag
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Fri, 7 Oct 2011 12:29:03 +0000 (13:29 +0100)]
avtools: add -v as alias for -loglevel
This saves a bit of typing.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Anton Khirnov [Sun, 9 Oct 2011 14:32:54 +0000 (16:32 +0200)]
avconv: always print stats with AV_LOG_INFO
It's now possible to disable printing stats during encoding with
-nostats, so there's no reason to print them differently depending on
whether it's last report or not.
Anton Khirnov [Sun, 9 Oct 2011 13:57:54 +0000 (15:57 +0200)]
doc/avconv: add forgotten output/per-stream info to -filter
Anton Khirnov [Sun, 9 Oct 2011 13:57:30 +0000 (15:57 +0200)]
avconv: add -stats option to enable/disable printing encoding progress
Anton Khirnov [Tue, 27 Sep 2011 18:00:28 +0000 (20:00 +0200)]
avconv: in output_packet() don't set decoded_data_size for video.
It's only used for audio.
Anton Khirnov [Tue, 27 Sep 2011 06:21:48 +0000 (08:21 +0200)]
avconv: remove pointless always true condition
Anton Khirnov [Tue, 27 Sep 2011 06:16:26 +0000 (08:16 +0200)]
avconv: factorize common code in transcode_init()
Stefano Sabatini [Sun, 2 Oct 2011 09:26:07 +0000 (11:26 +0200)]
ffprobe: parse arguments for -print_format writer
This allows -print_format to accept string of the form WRITER=OPTIONS,
as required by the pending compact writer patch.
Stefano Sabatini [Sun, 2 Oct 2011 09:59:38 +0000 (11:59 +0200)]
ffprobe: create a dedicated "Writers" section in the manual
Also update documentation related to the output format.
Stefano Sabatini [Tue, 27 Sep 2011 18:07:51 +0000 (20:07 +0200)]
ffprobe: extend writers API, and move the writers up in the file
The new provided API is more flexible and is decoupled from the
application level code, so it is easier to maintain.
Stefano Sabatini [Sun, 9 Oct 2011 13:58:10 +0000 (15:58 +0200)]
lavu: bump micro after gcd(), random(), and hypot() additions in eval
Clément Bœsch [Sun, 9 Oct 2011 08:23:58 +0000 (10:23 +0200)]
doc: avoid "@table has text but no @item" warning.
Mans Rullgard [Sun, 9 Oct 2011 12:21:10 +0000 (13:21 +0100)]
zmbv: remove memcpy() of decoded frame
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sat, 8 Oct 2011 11:56:54 +0000 (12:56 +0100)]
mpeg12enc: use sign_extend() function
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sat, 8 Oct 2011 20:22:06 +0000 (21:22 +0100)]
h264pred: use unsigned types for pixel values, fix signed overflows
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sat, 8 Oct 2011 20:19:51 +0000 (21:19 +0100)]
h264: fix signed overflows in x*0x01010101 expressions
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sat, 8 Oct 2011 19:32:09 +0000 (20:32 +0100)]
h264pred: remove unused variables
Signed-off-by: Mans Rullgard <mans@mansr.com>
Themaister [Sat, 8 Oct 2011 10:16:43 +0000 (12:16 +0200)]
Allow YUV444P and RGB/BGR encoding for libx264.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 9 Oct 2011 02:02:03 +0000 (04:02 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavf: fix signed overflow in avformat_find_stream_info()
vp8: fix signed overflows
motion_est: fix some signed overflows
dca: fix signed overflow in shift
aacdec: fix undefined shifts
bink: Check for various out of bound writes
bink: Check for out of bound writes when building tree
put_bits: fix invalid shift by 32 in flush_put_bits()
Conflicts:
libavcodec/bink.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Laurent Aimar [Sat, 8 Oct 2011 21:40:36 +0000 (23:40 +0200)]
qtrle: check for out of bound writes.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Laurent Aimar [Sat, 8 Oct 2011 21:40:34 +0000 (23:40 +0200)]
xxan: check for out of bound accesses
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Laurent Aimar [Sat, 8 Oct 2011 19:57:27 +0000 (21:57 +0200)]
txd: check for out of bound reads.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Laurent Aimar [Sat, 8 Oct 2011 21:01:33 +0000 (23:01 +0200)]
qtrle: check for invalid line offset
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Laurent Aimar [Sat, 8 Oct 2011 23:54:41 +0000 (01:54 +0200)]
vqavideo: check for out of bound reads.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Laurent Aimar [Sat, 8 Oct 2011 21:40:37 +0000 (23:40 +0200)]
vqa: fix double free on corrupted streams
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Laurent Aimar [Sat, 8 Oct 2011 21:40:39 +0000 (23:40 +0200)]
vqavideo: check for invalid/unsupported version
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>