OSDN Git Service
Michael Niedermayer [Sun, 16 Oct 2011 01:44:00 +0000 (03:44 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
prores: get correct size for coded V plane if alpha is present
prores: do not set pixel format on codec init
pthread: prevent updating AVCodecContext from itself in frame_thread_free
pthread: copy coded frame dimensions in update_context_from_thread
vp8: prevent read from uninitialized memory in decode_mvs
vp8: force reallocation in update_thread_context after frame size change
vp8: fix return value if update_dimensions fails
matroskadec: fix out of bounds write
adpcmdec: calculate actual number of output samples for each decoder.
adpcmdec: check remaining buffer size before decoding next block in the ADPCM IMA WAV decoder.
adpcmdec: do not terminate early in ADPCM IMA Duck DK3 decoder.
adpcmdec: remove unneeded buf_size==0 check.
adpcmdec: remove unneeded zeroing of *data_size
dnxhdenc: fixed signed multiplication overflow
Conflicts:
tests/ref/fate/prores-alpha
tests/ref/fate/truemotion1-24
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Oct 2011 00:43:36 +0000 (02:43 +0200)]
bit: require at least 1 frame for probing
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Oct 2011 00:38:02 +0000 (02:38 +0200)]
idf: Improve idf_probe() so it doesnt succeed on 0 byte input
JULIAN GARDNER [Fri, 14 Oct 2011 12:36:56 +0000 (14:36 +0200)]
dvbsubdec: cosmetic change on how xpos is passed around
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sat, 15 Oct 2011 23:49:20 +0000 (01:49 +0200)]
af_ashowinfo: fix plane size computation for planar layout formats
+10l.
Stefano Sabatini [Fri, 16 Sep 2011 23:30:15 +0000 (01:30 +0200)]
af_aresample: fix properties setting in the output buffer
In particular: set output timebase to 1/output_sample_rate, fix output
PTS computation, and do not forget to copy properties values from the
input buffer.
Stefano Sabatini [Sat, 15 Oct 2011 22:44:22 +0000 (00:44 +0200)]
af_ashowinfo: adopt used plane size when computing the plane checksum
Fix checksum computation when the used plane size is different from the
allocated plane size, as it was wrongly assumed.
Michael Niedermayer [Sat, 15 Oct 2011 19:28:43 +0000 (21:28 +0200)]
dvbsubdec: Fix 0xf0 end detection
Based on a change by JULIAN GARDNER
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
JULIAN GARDNER [Sat, 15 Oct 2011 18:30:54 +0000 (20:30 +0200)]
dvbsub: add comments
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
JULIAN GARDNER [Sat, 15 Oct 2011 18:30:18 +0000 (20:30 +0200)]
dvbsub: add dvb_encode_rle8()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
JULIAN GARDNER [Sat, 15 Oct 2011 18:28:51 +0000 (20:28 +0200)]
dvbsub: Move setting of *dvb_encode_rle() up
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
JULIAN GARDNER [Sat, 15 Oct 2011 18:16:31 +0000 (20:16 +0200)]
dvbsubdec:dvbsub_display_end_segment() move main loop under if() as its useless if false.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sat, 15 Oct 2011 16:28:32 +0000 (18:28 +0200)]
Support H264 from QNAP Systems.
Mans Rullgard [Sat, 15 Oct 2011 13:35:49 +0000 (14:35 +0100)]
prores: get correct size for coded V plane if alpha is present
The size check must be updated to take into account both manners
in which v_data_size might be set.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sat, 15 Oct 2011 13:35:10 +0000 (14:35 +0100)]
prores: do not set pixel format on codec init
The pixel format is not known until the frame header is parsed.
Guessing it here only causes trouble for the caller if the guess
turns out to be wrong (and actually causes very wrong output by
avconv/avplay).
Signed-off-by: Mans Rullgard <mans@mansr.com>
Michael Niedermayer [Sat, 15 Oct 2011 13:32:34 +0000 (15:32 +0200)]
h264: Workaround invalid flag combinations of 8x8 inference.
Fixes Ticket555
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Fri, 14 Oct 2011 13:13:20 +0000 (15:13 +0200)]
ffprobe: add AVClass to writers
It is useful for logging messages from a writer context.
Ronald S. Bultje [Fri, 14 Oct 2011 21:47:45 +0000 (23:47 +0200)]
pthread: prevent updating AVCodecContext from itself in frame_thread_free
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Ronald S. Bultje [Fri, 14 Oct 2011 21:46:06 +0000 (23:46 +0200)]
pthread: copy coded frame dimensions in update_context_from_thread
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Ronald S. Bultje [Fri, 14 Oct 2011 21:43:29 +0000 (23:43 +0200)]
vp8: prevent read from uninitialized memory in decode_mvs
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Ronald S. Bultje [Fri, 14 Oct 2011 21:27:52 +0000 (23:27 +0200)]
vp8: force reallocation in update_thread_context after frame size change
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Ronald S. Bultje [Fri, 14 Oct 2011 21:21:46 +0000 (23:21 +0200)]
vp8: fix return value if update_dimensions fails
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Ronald S. Bultje [Fri, 14 Oct 2011 22:03:55 +0000 (00:03 +0200)]
matroskadec: fix out of bounds write
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Michael Niedermayer [Fri, 14 Oct 2011 19:56:46 +0000 (21:56 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
proresdsp: fix function prototypes.
prores-idct: fix overflow in c code.
fate: update prores-alpha ref after changing pix_fmt to yuv444p10le
prores: add missing feature warning for alpha
mov: 10l: Terminate string with 0 not '0'
mov: Prevent illegal writes when chapter titles are very short.
prores: add appropriate -fix_fmt parameter to FATE command
riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header
lavc: add a flag-based error_recognition field to AVCodecContext and deprecate non-flag-based ER field
lavc: rename deprecation symbol FF_API_VERY_AGGRESSIVE to FF_API_ER
Conflicts:
libavcodec/avcodec.h
libavformat/mov.c
tests/fate/prores.mak
tests/ref/acodec/g726
tests/ref/fate/prores-alpha
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Justin Ruggles [Sun, 2 Oct 2011 14:18:17 +0000 (10:18 -0400)]
adpcmdec: calculate actual number of output samples for each decoder.
This also allows for removing some of the buf_size checks and using the
sample count for some of the decoding loops.
Justin Ruggles [Sun, 2 Oct 2011 20:07:55 +0000 (16:07 -0400)]
adpcmdec: check remaining buffer size before decoding next block in the
ADPCM IMA WAV decoder.
Justin Ruggles [Sun, 2 Oct 2011 19:58:54 +0000 (15:58 -0400)]
adpcmdec: do not terminate early in ADPCM IMA Duck DK3 decoder.
There are still 2 nibbles to decode once the last byte in the packet has been
read. Updated FATE reference.
Justin Ruggles [Sun, 2 Oct 2011 18:43:28 +0000 (14:43 -0400)]
adpcmdec: remove unneeded buf_size==0 check.
This is already done by avcodec_decode_audio3()
Justin Ruggles [Sun, 2 Oct 2011 18:41:34 +0000 (14:41 -0400)]
adpcmdec: remove unneeded zeroing of *data_size
Mans Rullgard [Sat, 8 Oct 2011 00:37:20 +0000 (01:37 +0100)]
dnxhdenc: fixed signed multiplication overflow
The low 32 bits of a multiplication are the same for signed
and unsigned operands. Casting to unsigned before multiplying
is thus equivalent while avoiding signed overflow, which is
undefined by the C99 standard.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Michael Niedermayer [Fri, 14 Oct 2011 19:45:14 +0000 (21:45 +0200)]
proresdec: rename to avoid confusion
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Fri, 14 Oct 2011 16:28:46 +0000 (09:28 -0700)]
proresdsp: fix function prototypes.
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Ronald S. Bultje [Fri, 14 Oct 2011 16:27:59 +0000 (09:27 -0700)]
prores-idct: fix overflow in c code.
Fix the fate ref for prores-422_proxy by reverting the changes to it
in commit
f492df0927c42da174edb674857670fc50abc5dc
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Janne Grunau [Fri, 14 Oct 2011 19:20:46 +0000 (21:20 +0200)]
fate: update prores-alpha ref after changing pix_fmt to yuv444p10le
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Janne Grunau [Fri, 14 Oct 2011 10:18:23 +0000 (12:18 +0200)]
prores: add missing feature warning for alpha
JULIAN GARDNER [Fri, 14 Oct 2011 14:41:21 +0000 (16:41 +0200)]
dvbsubdec: add version checking
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
JULIAN GARDNER [Fri, 14 Oct 2011 14:33:34 +0000 (16:33 +0200)]
dvbsubdec: handle mode change page state
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
JULIAN GARDNER [Fri, 14 Oct 2011 14:26:38 +0000 (16:26 +0200)]
dvbsubdec: change the top_bottom correction
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
JULIAN GARDNER [Fri, 14 Oct 2011 14:08:06 +0000 (16:08 +0200)]
dvbsubdec: fix buf ptr in dvbsub_parse_region_segment()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
JULIAN GARDNER [Fri, 14 Oct 2011 13:49:40 +0000 (15:49 +0200)]
dvbsubdec: bottom_field_len fix
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
JULIAN GARDNER [Fri, 14 Oct 2011 13:39:33 +0000 (15:39 +0200)]
dvbsubdec: fix x/y_pos checks
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
JULIAN GARDNER [Fri, 14 Oct 2011 13:38:55 +0000 (15:38 +0200)]
dvbsubdec: outcomment debug stuff in dvbsub_parse_pixel_data_block()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
JULIAN GARDNER [Fri, 14 Oct 2011 13:28:50 +0000 (15:28 +0200)]
dvbsubdec: dirty handkling
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
JULIAN GARDNER [Fri, 14 Oct 2011 12:52:33 +0000 (14:52 +0200)]
dvbsubdec: Fix variable increments & checking in dvbsub_read_*bit_string()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Oct 2011 17:30:10 +0000 (19:30 +0200)]
prores: use C idct for fate as the SSE code is not matching the SSE* code down at the bits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Alex Converse [Fri, 14 Oct 2011 17:38:42 +0000 (10:38 -0700)]
mov: 10l: Terminate string with 0 not '0'
Alex Converse [Thu, 13 Oct 2011 21:47:06 +0000 (14:47 -0700)]
mov: Prevent illegal writes when chapter titles are very short.
Diego Biurrun [Fri, 14 Oct 2011 14:11:32 +0000 (16:11 +0200)]
prores: add appropriate -fix_fmt parameter to FATE command
Also correct CRCs for Sequence_1-Apple_ProRes_422_Proxy.mov, previous
CRCs were generated with the non-bitexact x86_64 assembler IDCT.
Michael Niedermayer [Fri, 14 Oct 2011 12:04:29 +0000 (14:04 +0200)]
fate: enable the prores tests
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
John Brooks [Thu, 13 Oct 2011 08:34:20 +0000 (08:34 +0000)]
riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header
The cbSize field should be included in all cases, even with PCM where
its value is ignored.
Fixes encoding PCM audio in Matroska for some players which insist on
a full WAVEFORMATEX structure for A_MS/ACM audio.
Since fate uses wav files for the audio test a larger number of tests
has changed checksums or shifted positions due to the 2 byte longer
wave header.
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Dustin Brody [Thu, 13 Oct 2011 07:26:53 +0000 (03:26 -0400)]
lavc: add a flag-based error_recognition field to AVCodecContext and deprecate non-flag-based ER field
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Dustin Brody [Thu, 13 Oct 2011 07:26:27 +0000 (03:26 -0400)]
lavc: rename deprecation symbol FF_API_VERY_AGGRESSIVE to FF_API_ER
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Michael Niedermayer [Fri, 14 Oct 2011 01:43:24 +0000 (03:43 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master: (22 commits)
prores: add FATE tests
id3v2: reduce the scope of some non-globally-used symbols/structures
id3v2: cosmetics: move some declarations before the places they are used
shorten: remove the flush function.
shn: do not allow seeking in the raw shn demuxer.
avformat: add AVInputFormat flag AVFMT_NO_BYTE_SEEK.
avformat: update AVInputFormat allowed flags
avformat: don't unconditionally call ff_read_frame_flush() when trying to seek.
truespeech: use sizeof() instead of hardcoded sizes
truespeech: remove unneeded variable, 'consumed'
truespeech: simplify truespeech_read_frame() by using get_bits()
truespeech: decode directly to output buffer instead of a temp buffer
truespeech: check to make sure channels == 1
truespeech: check for large enough output buffer rather than truncating output
truespeech: remove unneeded zero-size packet check.
mlpdec: return meaningful error codes instead of -1
mlpdec: remove unnecessary wrapper function
mlpdec: only calculate output size once
mlpdec: validate that the reported channel count matches the actual output channel count
pcm: reduce pointer type casting
...
Conflicts:
libavformat/avformat.h
libavformat/id3v2.c
libavformat/id3v2.h
libavformat/utils.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Oct 2011 00:14:09 +0000 (02:14 +0200)]
cmdutils.h: Project name cleanup
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Oct 2011 00:13:46 +0000 (02:13 +0200)]
cmdutils: Fix loglevel for -debug
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Oct 2011 23:45:13 +0000 (01:45 +0200)]
proresdec: set CODEC_CAP_DR1, it appears this was forgotten.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Oct 2011 19:59:04 +0000 (21:59 +0200)]
opt: handle AV_OPT_TYPE_CONST too
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Fri, 23 Sep 2011 00:06:23 +0000 (02:06 +0200)]
prores: add FATE tests
Diego Biurrun [Mon, 10 Oct 2011 13:51:02 +0000 (15:51 +0200)]
id3v2: reduce the scope of some non-globally-used symbols/structures
Diego Biurrun [Mon, 10 Oct 2011 13:48:59 +0000 (15:48 +0200)]
id3v2: cosmetics: move some declarations before the places they are used
Justin Ruggles [Sat, 17 Sep 2011 02:21:47 +0000 (22:21 -0400)]
shorten: remove the flush function.
The shorten decoder does not support seeking.
Justin Ruggles [Sun, 2 Oct 2011 16:03:22 +0000 (12:03 -0400)]
shn: do not allow seeking in the raw shn demuxer.
The demuxer does not read the seektable, a parser is not possible without a
full decode, and no shorten decoder can handle random seeking because it needs
side info from the seektable.
Justin Ruggles [Sun, 2 Oct 2011 15:57:53 +0000 (11:57 -0400)]
avformat: add AVInputFormat flag AVFMT_NO_BYTE_SEEK.
This will prevent seeking by bytes for formats that cannot handle this.
Justin Ruggles [Sun, 2 Oct 2011 15:29:20 +0000 (11:29 -0400)]
avformat: update AVInputFormat allowed flags
Justin Ruggles [Fri, 16 Sep 2011 23:02:23 +0000 (19:02 -0400)]
avformat: don't unconditionally call ff_read_frame_flush() when trying to seek.
This prevents flushing the packet buffer when the input format does not
support seeking.
Justin Ruggles [Thu, 13 Oct 2011 18:03:17 +0000 (14:03 -0400)]
truespeech: use sizeof() instead of hardcoded sizes
Justin Ruggles [Thu, 13 Oct 2011 04:21:17 +0000 (00:21 -0400)]
truespeech: remove unneeded variable, 'consumed'
increment the 'buf' pointer instead, and consume the whole packet.
Justin Ruggles [Thu, 13 Oct 2011 04:17:05 +0000 (00:17 -0400)]
truespeech: simplify truespeech_read_frame() by using get_bits()
Justin Ruggles [Thu, 13 Oct 2011 03:27:32 +0000 (23:27 -0400)]
truespeech: decode directly to output buffer instead of a temp buffer
Justin Ruggles [Thu, 13 Oct 2011 03:23:18 +0000 (23:23 -0400)]
truespeech: check to make sure channels == 1
Justin Ruggles [Thu, 13 Oct 2011 03:15:00 +0000 (23:15 -0400)]
truespeech: check for large enough output buffer rather than truncating output
Justin Ruggles [Thu, 13 Oct 2011 03:10:41 +0000 (23:10 -0400)]
truespeech: remove unneeded zero-size packet check.
This is already checked in avcodec_decode_audio3()
Justin Ruggles [Thu, 13 Oct 2011 02:47:50 +0000 (22:47 -0400)]
mlpdec: return meaningful error codes instead of -1
Justin Ruggles [Thu, 13 Oct 2011 02:37:12 +0000 (22:37 -0400)]
mlpdec: remove unnecessary wrapper function
Justin Ruggles [Wed, 21 Sep 2011 16:14:28 +0000 (12:14 -0400)]
mlpdec: only calculate output size once
Justin Ruggles [Thu, 13 Oct 2011 02:30:44 +0000 (22:30 -0400)]
mlpdec: validate that the reported channel count matches the actual output
channel count
Reimar Döffinger [Thu, 13 Oct 2011 17:45:49 +0000 (19:45 +0200)]
Improve PVA probe function.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Mans Rullgard [Sat, 8 Oct 2011 11:47:53 +0000 (12:47 +0100)]
pcm: reduce pointer type casting
Making 'samples' a pointer to uint8_t simplifies the DECODE
macro and reduces the amount of type casting overall.
This also fixes some signed overflows on left shift.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Nicolas George [Thu, 13 Oct 2011 15:54:11 +0000 (17:54 +0200)]
libmodplug: remove mathematical constants now redundant.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Thu, 13 Oct 2011 15:54:10 +0000 (17:54 +0200)]
vsrc_nullsrc: remove mathematical constants now redundant.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Thu, 13 Oct 2011 15:54:01 +0000 (17:54 +0200)]
vf_crop: remove mathematical constants now redundant.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Thu, 13 Oct 2011 15:54:09 +0000 (17:54 +0200)]
vf_settb: remove mathematical constants now redundant.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Thu, 13 Oct 2011 15:54:08 +0000 (17:54 +0200)]
vf_setpts: remove mathematical constants now redundant.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Thu, 13 Oct 2011 15:54:07 +0000 (17:54 +0200)]
vf_select: remove mathematical constants now redundant.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Thu, 13 Oct 2011 15:54:06 +0000 (17:54 +0200)]
vf_scale: remove mathematical constants now redundant.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Thu, 13 Oct 2011 15:54:05 +0000 (17:54 +0200)]
vf_pad: remove mathematical constants now redundant.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Thu, 13 Oct 2011 15:54:04 +0000 (17:54 +0200)]
vf_overlay: remove mathematical constants now redundant.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Thu, 13 Oct 2011 15:54:03 +0000 (17:54 +0200)]
vf_lut: remove mathematical constants now redundant.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Thu, 13 Oct 2011 15:54:02 +0000 (17:54 +0200)]
vf_drawtext: remove mathematical constants now redundant.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Oct 2011 15:54:22 +0000 (17:54 +0200)]
Merge remote-tracking branch 'hexene/stagefright'
* hexene/stagefright:
tools/build_libstagefright: fetch android system headers and libraries
libstagefright: reindent after previous commit
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Thu, 13 Oct 2011 11:24:24 +0000 (13:24 +0200)]
eval: add mathematical constants (PI, E, PHI).
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mohamed Naufal [Thu, 13 Oct 2011 10:18:51 +0000 (15:48 +0530)]
g723.1: use raw muxer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mans Rullgard [Sun, 9 Oct 2011 11:57:08 +0000 (12:57 +0100)]
mathops: remove undefined behaviour from sign_extend()
This function intentionally overflows the signed range on
the left shift. Using this type-punning avoids errors from
the overflow checker without disabling this test globally.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Kostya Shishkov [Thu, 13 Oct 2011 08:12:42 +0000 (10:12 +0200)]
vc1: explicitly zero interlaced mode coding variables for progressive mode
Both v->fcm and v->field_mode are used in common code, now they won't be
reset for progressive frame after interlaced one causing writing past the
frame end for example.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Michael Niedermayer [Thu, 13 Oct 2011 02:55:40 +0000 (04:55 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master: (31 commits)
tiffenc: initialize forgotten avctx.
avplay: free the active audio packet at exit.
avplay: free rdft data used for spectrogram analysis.
log.h: make AVClass a named struct
fix ac3 encoder documentation
vc1: more prettyprinting cosmetics
vc1: prettyprint some tables
vc1: K&R formatting cosmetics
AVOptions: bump minor and add APIchanges entry.
cmdutils/avtools: simplify show_help() by using av_opt_child_class_next()
AVOptions: rename FF_OPT_TYPE_* => AV_OPT_TYPE_*
Remove all uses of deprecated AVOptions API.
AVOptions: add av_opt_next, deprecate av_next_option.
AVOptions: add functions for evaluating option strings.
AVOptions: split get_number().
AVOptions: add av_opt_get*, deprecate av_get*.
AVOptions: add av_opt_set*().
AVOptions: add new API for enumerating children.
rv34: move inverse transform functions to DSP context
flvenc: Write the right metadata entry count
...
Conflicts:
avconv.c
cmdutils.c
doc/APIchanges
ffplay.c
ffprobe.c
libavcodec/ac3dec.c
libavcodec/h264.c
libavcodec/libvpxenc.c
libavcodec/libx264.c
libavcodec/mpeg12enc.c
libavcodec/options.c
libavdevice/libdc1394.c
libavdevice/v4l2.c
libavfilter/vf_drawtext.c
libavformat/flvdec.c
libavformat/mpegtsenc.c
libavformat/options.c
libavutil/avutil.h
libavutil/opt.c
libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
John Brooks [Wed, 12 Oct 2011 06:53:12 +0000 (00:53 -0600)]
Correct buffer handling for RTCP packets
Previous code could read 4 bytes past the end of the buffer on a RTCP_SR
packet or offset a pointer by an unchecked external value (payload_len),
though neither will reliably cause a crash or other misbehavior beyond
garbage timestamps.
Additionally, unknown RTCP packet types, even in compounded packets, are
now ignored as per RFC 3550 section 6.1, page 22, though currently this
only has any practical effect if a sender puts an unrecognized type
before RTCP_BYE in a compounded packet, or (incorrectly) does not put
RTCP_SR first.
Signed-off-by: John Brooks <john.brooks@bluecherry.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Jean First [Fri, 23 Sep 2011 21:39:51 +0000 (23:39 +0200)]
tiffenc: initialize forgotten avctx.
Justin Ruggles [Wed, 12 Oct 2011 18:44:02 +0000 (14:44 -0400)]
avplay: free the active audio packet at exit.
fixes a memleak
Justin Ruggles [Wed, 12 Oct 2011 18:38:02 +0000 (14:38 -0400)]
avplay: free rdft data used for spectrogram analysis.
fixes a memleak
Jindrich Makovicka [Wed, 12 Oct 2011 20:30:56 +0000 (22:30 +0200)]
log.h: make AVClass a named struct
'struct AVClass' is used in the code since
641c7afe3c17334b81e3e2eef88f1751eb68f89f, but AVClass is typedeffed as
an anonymous struct.
Signed-off-by: Anton Khirnov <anton@khirnov.net>