Commit Graph

31882 Commits

Author SHA1 Message Date
Zohar Kelrich
5081514269 mpegts: Mark wrongly-sized packets as corrupted
Signed-off-by: Zohar Kelrich <lumimies@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2011-08-02 02:52:41 +02:00
Zohar Kelrich
cdb9884a63 mpegts: Move scan test to handle_packets
This fixes an issue where packets which start being read
while reading the header stick around after a seek.

Signed-off-by: Zohar Kelrich <lumimies@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2011-08-02 02:52:27 +02:00
Zohar Kelrich
ce9e31655e mpegts: Mark corrupted packets
Signed-off-by: Zohar Kelrich <lumimies@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2011-08-02 02:43:22 +02:00
Zohar Kelrich
c64f80b0e8 mpegts: Reset continuity counter on seek
Signed-off-by: Zohar Kelrich <lumimies@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2011-08-02 02:43:22 +02:00
Zohar Kelrich
8b9df201df mpegts: Fix for continuity counter
Make continuity counter respect discontinuity flag
and null packets. Unpack the adaptation_field_control field.

Signed-off-by: Zohar Kelrich <lumimies@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2011-08-02 02:43:22 +02:00
Zohar Kelrich
be9c00615b mpegts: Silence "can't seek" warning on unseekable
Do not try to seek when we already know we are not allowed to.
Silences warning that always happens when streaming.

Signed-off-by: Zohar Kelrich <lumimies@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2011-08-02 02:43:21 +02:00
Luca Barbato
5038f9b268 apichange: add an entry for AV_PKT_FLAG_CORRUPT 2011-08-02 02:43:10 +02:00
Luca Barbato
9d39cbf6cf avpacket: signal possibly corrupted packets
Use AV_PKT_FLAG_CORRUPT flag to mark packets that might be incomplete
or have errors. Formats that have a mean to validate their packets
should use this flag to deliver such information instead of silently
dropping the packets.
2011-08-02 02:19:31 +02:00
Dustin Brody
4326f6f525 mpeg4videodec: remove dead code that would have detected erroneous encoding
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2011-08-01 21:06:48 +02:00
Alex Converse
a6c49f18ab aac: Remove some suspicious illegal memcpy()s from LTP. 2011-08-01 09:39:33 -07:00
Alex Converse
e11a5fccb2 bink: Eliminate unnecessary shadow declaration. 2011-08-01 09:39:33 -07:00
Michael Niedermayer
03cbe6c8bc Merge remote-tracking branch 'qatar/master'
* qatar/master:
Not merged:  Remove the ffserver test.
  Remove ffserver.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-01 18:32:52 +02:00
Compn
29d854d6c5 correct shorthand ffmpeg-dev > ffmpeg-devel 2011-08-01 09:55:54 -04:00
Anton Khirnov
b4ea1c5a77 Remove the ffserver test.
It doesn't work and is therefore useless.
2011-08-01 11:36:16 +02:00
Anton Khirnov
e5fc6ab665 Remove ffserver.h
It's unused an serves no purpose.
2011-08-01 11:36:16 +02:00
Carl Eugen Hoyos
318fd9dac2 Remove non-existing fourcc " Y8".
This reverts a line of r1842.
2011-08-01 01:26:55 +02:00
Carl Eugen Hoyos
1c5480651e Support FourCC DreX as MPEG4 ASP. 2011-08-01 01:23:39 +02:00
Carl Eugen Hoyos
b36bd27fbe Rm lavfi-showfiltfmts on make testclean. 2011-08-01 00:58:49 +02:00
Carl Eugen Hoyos
940a116b1f Unbreak ffplay -s and ffplay -pix_fmt. 2011-08-01 00:58:49 +02:00
Carl Eugen Hoyos
8460b757c2 Do not ignore opt_default() return values. 2011-08-01 00:58:49 +02:00
Carl Eugen Hoyos
222b333ed5 Cosmetics: Restore alphabetical order. 2011-08-01 00:58:49 +02:00
Carl Eugen Hoyos
9b60b076fb Support muxing MP1, MP2 and MP3 in caf. 2011-08-01 00:58:49 +02:00
Carl Eugen Hoyos
c6e0332f30 Explicitely fail for unsupported codecs when muxing caf. 2011-08-01 00:58:49 +02:00
Carl Eugen Hoyos
b35477a2f2 Use av_get_bits_per_sample() for mBitsPerChannel in caf. 2011-08-01 00:58:49 +02:00
Naoya OYAMA
7747a091f5 Cosmetics: Fix indentation. 2011-08-01 00:58:49 +02:00
Michael Niedermayer
335bbe424f Merge remote-tracking branch 'qatar/master'
* qatar/master:
  lavc: Deprecate unused FF_ER_VERY_AGGRESSIVE
  x11grab: add show_region AVOption.
  x11grab: add follow_mouse AVOption.
  Do not convert RGB buffer at once when stride does not fit exact samples.

Conflicts:
	libswscale/swscale_unscaled.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-01 00:35:57 +02:00
Dustin Brody
18cb40f074 lavc: Deprecate unused FF_ER_VERY_AGGRESSIVE
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-07-31 14:53:38 -07:00
Reimar Döffinger
b39f872a41 Limit fsize before adding to pointer.
This avoids a theoretically possible pointer arithmetic overflow
which would lead to a crash due to reading from NULL page.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-07-31 19:40:08 +02:00
Yu-Jie Lin
1442d29533 x11grab: add show_region AVOption.
Draw the current grabbing region for indication.

Signed-off-by: Yu-Jie Lin <livibetter@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-07-31 14:26:08 +02:00
Yu-Jie Lin
085791a92e x11grab: add follow_mouse AVOption.
-follow_mouse centered|PIXELS
  move grabbing region to where mouse pointer at the center; or
  only move when pointer reaches within PIXELS to the edge.

Signed-off-by: Yu-Jie Lin <livibetter@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-07-31 14:25:00 +02:00
Michael Niedermayer
8400607267 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  build: make examples build normally

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-31 00:34:47 +02:00
Kostya Shishkov
42ba12888b Do not convert RGB buffer at once when stride does not fit exact samples.
When converting RGB format to RGB format with the same bits per sample,
unscaled path performs conversion on the whole buffer at once. For
non-multiple-of-16 BGR24 to RGB24 conversion it means that padding at the
end of line will be converted too. Since it may be of arbitrary length
(e.g. 8 bytes), operating on the whole buffer produces obviously wrong
results.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-07-30 09:51:23 -07:00
Stefano Sabatini
3b5ddf07c0 vf_pad: add an example employing the sar variable 2011-07-30 18:31:10 +02:00
Stefano Sabatini
9959a76782 ffplay: set input link sample aspect ratio in input_config_props()
Allow sample_aspect_ratio information to be correctly propagated in
the filterchain.
2011-07-30 18:31:10 +02:00
Stefano Sabatini
45f9e053d8 vf_crop: add support for a, dar, sar, hsub, and vsub variables
Consistent with the pad and scale filters.
2011-07-30 18:30:07 +02:00
Stefano Sabatini
61d55fda2b lavfi: tweak display aspect ratio variables in pad and scale filters
Previously, "dar" and "a" were documented like "input display aspect
ratio", but their actual value was "in_w/in_h".

In order to avoid to break scripts which rely on the "a" variable, the
patch keeps the same semantics but fixes the corresponding docs, and
fixes the semantics of the recently added "dar" variable, which
now correctly expresses the input Display Aspect Ratio value as
"(inw_w/in_h)*sar".
2011-07-30 18:27:24 +02:00
Luca Barbato
8a54bfe83f build: make examples build normally
The link target was missing $(EXAMPLES)
2011-07-30 13:42:44 +02:00
Reimar Döffinger
0e29c4f761 Revert bink dequantization hack that is no longer necessary.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-07-30 11:22:11 +02:00
Michael Niedermayer
faba79e080 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  mxfdec: Include FF_INPUT_BUFFER_PADDING_SIZE when allocating extradata.
  H.264: tweak some other x86 asm for Atom
  probe: Fix insane flow control.
  mpegts: remove invalid error check
  s302m: use nondeprecated audio sample format API
  lavc: use designated initialisers for all codecs.
  x86: cabac: add operand size suffixes missing from 6c32576

Conflicts:
	libavcodec/ac3enc_float.c
	libavcodec/flacenc.c
	libavcodec/frwu.c
	libavcodec/pictordec.c
	libavcodec/qtrleenc.c
	libavcodec/v210enc.c
	libavcodec/wmv2dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-30 06:46:08 +02:00
Alex Converse
1f6f58d585 mxfdec: Include FF_INPUT_BUFFER_PADDING_SIZE when allocating extradata.
This prevents out of bounds reads when extradata is being decoded.
2011-07-29 16:03:53 -07:00
Jason Garrett-Glaser
a3bf7b864a H.264: tweak some other x86 asm for Atom 2011-07-29 12:24:15 -07:00
Stefano Sabatini
d9c23a0d5a vf_transpose: avoid multiple calls to avfilter_draw_slice()
avfilter_draw_slice() is already called in the end_frame() callback,
this avoids multiple calls. This is done by adding a null draw_slice()
callback.

In particular fix crash occurring with -vf transpose=3,hflip, fix trac
issue #371.
2011-07-29 20:24:44 +02:00
Alex Converse
5ef953e84f probe: Fix insane flow control.
A loop control variable was shadowed inside the loop and never updated.
2011-07-29 09:29:44 -07:00
Mike Williams
298c4e3c52 mpegts: remove invalid error check
mpegts_read_header is used by both mpegts and mpegtsraw, so this
erro check is no longer valid.

Signed-off-by: Mike Williams <mike@mikebwilliams.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-07-29 08:48:33 +02:00
Dustin Brody
8f9d3f6d9a s302m: use nondeprecated audio sample format API
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-07-29 08:47:34 +02:00
Anton Khirnov
ec6402b7c5 lavc: use designated initialisers for all codecs.
It's more readable and less prone to breakage.
2011-07-29 08:42:34 +02:00
Mans Rullgard
3ad1684126 x86: cabac: add operand size suffixes missing from 6c32576
This fixes build with clang.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-07-28 18:59:23 -07:00
Michael Niedermayer
2dd2abe391 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  h263dec: Propagate AV_LOG_ERRORs from slice decoding through frame decoding with sufficient error recognition
  x86: cabac: don't load/store context values in asm
  H.264: optimize CABAC x86 asm for Atom
  vp3/theora: flush after seek.
  doc/fftools-common-opts: wording fixes missing from the previous commit.
  doc: document using AVOptions in fftools.
  cmdutils: add codec_opts parameter to setup_find_stream_info_opts()
  cmdutils: clarify documentation for filter_codec_opts()
  cmdutils: clarify documentation for setup_find_stream_info_opts()
  lavf: add forgotten attribute_deprecated to av_find_stream_info()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-29 01:50:53 +02:00
Dustin Brody
2a11952f45 h263dec: Propagate AV_LOG_ERRORs from slice decoding through frame decoding with sufficient error recognition
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-07-28 15:23:07 -07:00
Mans Rullgard
f5f004bc5a x86: cabac: don't load/store context values in asm
Inspection of compiled code shows gcc handles these fine on its own.
Benchmarking also shows no measurable speed difference.

Removing the remaining cases in get_cabac_bypass_sign_x86() does
cause more substantial changes to the compiled code with uncertain
impact.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-07-28 22:25:21 +01:00