ffmpeg.git
9 years agoswr: change minimum I/O channel count to zero.
Clément Bœsch [Sun, 20 Nov 2011 14:25:01 +0000 (15:25 +0100)]
swr: change minimum I/O channel count to zero.

This will silence the warning of av_set_opt_int() in swr for
input/output channels when the layout is not yet defined (or supported).

9 years agoMerge remote-tracking branch 'shariman/wmall'
Michael Niedermayer [Sun, 20 Nov 2011 14:43:19 +0000 (15:43 +0100)]
Merge remote-tracking branch 'shariman/wmall'

* shariman/wmall: (24 commits)
  Clean-up
  dump_int_buffer() to dump samples from a buffer
  Implement revert_cdlms()
  Doxy for reset_codec()
  Store transient state and position of transient area
  Implement use_high_update_speed() and use_normal_update_speed()
  Initialize num_logged_tiles and remove unnecessary codes
  Log index for each line of output
  Log tile size
  Output decoded residues
  Replace placeholders with actual calls to clear_codec_buffers() and reset_codec()
  Implement lms_update()
  Implement lms_predict()
  Implement reset_codec()
  Add missing syntax elements to WmallDecodeCtx
  Add .recent syntax element to cdlms struct
  Implement clear_codec_buffers()
  Add buffers to context necessary for reverting cdmls and mclms filter
  Use avpriv_copy_bits() instead of ff_copy_bits()
  Cosmetics
  ...

Conflicts:
libavcodec/wmalosslessdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavopts: Fix random values being printed in error messages:
Michael Niedermayer [Sun, 20 Nov 2011 13:44:41 +0000 (14:44 +0100)]
avopts: Fix random values being printed in error messages:
Bug introduced in:
commit 7bb1807c2dd9623842f1c6d454e7f2892b5bc8d7
Author: Anton Khirnov <anton@khirnov.net>
Date:   Tue Aug 23 12:58:49 2011 +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.

9 years agoFix compilation with YASM.
Reimar Döffinger [Sun, 20 Nov 2011 14:02:26 +0000 (15:02 +0100)]
Fix compilation with YASM.

YASM does not support %ifempty even though it is in the official
NASM documentation and supported since NASM 2.02.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
9 years agoHACK: fix compilation with NASM.
Reimar Döffinger [Tue, 8 Nov 2011 19:10:44 +0000 (20:10 +0100)]
HACK: fix compilation with NASM.

This issue is actually already fixed in NASM, however it will be a
bit before it arrives everywhere.
This should work as a temporary work-around.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
9 years agoClean-up
Mashiat Sarker Shakkhar [Sat, 12 Nov 2011 11:12:28 +0000 (17:12 +0600)]
Clean-up

9 years agodump_int_buffer() to dump samples from a buffer
Mashiat Sarker Shakkhar [Sat, 12 Nov 2011 13:14:51 +0000 (19:14 +0600)]
dump_int_buffer() to dump samples from a buffer

9 years agoImplement revert_cdlms()
Mashiat Sarker Shakkhar [Sat, 12 Nov 2011 10:07:12 +0000 (16:07 +0600)]
Implement revert_cdlms()

9 years agoDoxy for reset_codec()
Mashiat Sarker Shakkhar [Sat, 12 Nov 2011 10:04:35 +0000 (16:04 +0600)]
Doxy for reset_codec()

9 years agoStore transient state and position of transient area
Mashiat Sarker Shakkhar [Sat, 12 Nov 2011 10:03:54 +0000 (16:03 +0600)]
Store transient state and position of transient area

9 years agoImplement use_high_update_speed() and use_normal_update_speed()
Mashiat Sarker Shakkhar [Thu, 10 Nov 2011 07:42:10 +0000 (13:42 +0600)]
Implement use_high_update_speed() and use_normal_update_speed()

9 years agoInitialize num_logged_tiles and remove unnecessary codes
Mashiat Sarker Shakkhar [Thu, 10 Nov 2011 06:05:42 +0000 (12:05 +0600)]
Initialize num_logged_tiles and remove unnecessary codes

9 years agoLog index for each line of output
Mashiat Sarker Shakkhar [Thu, 10 Nov 2011 06:04:31 +0000 (12:04 +0600)]
Log index for each line of output

9 years agoLog tile size
Mashiat Sarker Shakkhar [Thu, 10 Nov 2011 06:03:51 +0000 (12:03 +0600)]
Log tile size

9 years agoOutput decoded residues
Mashiat Sarker Shakkhar [Tue, 8 Nov 2011 12:42:01 +0000 (18:42 +0600)]
Output decoded residues

9 years agoReplace placeholders with actual calls to clear_codec_buffers() and reset_codec()
Mashiat Sarker Shakkhar [Sat, 5 Nov 2011 21:04:12 +0000 (03:04 +0600)]
Replace placeholders with actual calls to clear_codec_buffers() and reset_codec()

9 years agoImplement lms_update()
Mashiat Sarker Shakkhar [Sat, 5 Nov 2011 21:02:41 +0000 (03:02 +0600)]
Implement lms_update()

9 years agoImplement lms_predict()
Mashiat Sarker Shakkhar [Sat, 5 Nov 2011 21:02:11 +0000 (03:02 +0600)]
Implement lms_predict()

9 years agoImplement reset_codec()
Mashiat Sarker Shakkhar [Sat, 5 Nov 2011 21:00:49 +0000 (03:00 +0600)]
Implement reset_codec()

9 years agoAdd missing syntax elements to WmallDecodeCtx
Mashiat Sarker Shakkhar [Sat, 5 Nov 2011 20:59:06 +0000 (02:59 +0600)]
Add missing syntax elements to WmallDecodeCtx

9 years agoAdd .recent syntax element to cdlms struct
Mashiat Sarker Shakkhar [Fri, 4 Nov 2011 20:32:56 +0000 (02:32 +0600)]
Add .recent syntax element to cdlms struct

9 years agoImplement clear_codec_buffers()
Mashiat Sarker Shakkhar [Fri, 4 Nov 2011 20:19:35 +0000 (02:19 +0600)]
Implement clear_codec_buffers()

9 years agoAdd buffers to context necessary for reverting cdmls and mclms filter
Mashiat Sarker Shakkhar [Fri, 4 Nov 2011 20:22:21 +0000 (02:22 +0600)]
Add buffers to context necessary for reverting cdmls and mclms filter

9 years agoUse avpriv_copy_bits() instead of ff_copy_bits()
Mashiat Sarker Shakkhar [Fri, 4 Nov 2011 19:25:22 +0000 (01:25 +0600)]
Use avpriv_copy_bits() instead of ff_copy_bits()

9 years agoCosmetics
Mashiat Sarker Shakkhar [Thu, 3 Nov 2011 20:50:54 +0000 (02:50 +0600)]
Cosmetics

9 years agoAdd missing ff_ before the AVCodec struct for wmalossless
Mashiat Sarker Shakkhar [Sun, 16 Oct 2011 18:45:10 +0000 (23:45 +0500)]
Add missing ff_ before the AVCodec struct for wmalossless

9 years agowmall: Working bitstream parser
Andreas Öman [Thu, 3 Mar 2011 08:31:34 +0000 (09:31 +0100)]
wmall: Working bitstream parser

9 years agohttpproxy: Fix dependencies
John Stebbins [Sat, 19 Nov 2011 17:58:26 +0000 (09:58 -0800)]
httpproxy: Fix dependencies

Fix building with --disable-network.

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agohttpproxy: Specify the object files needed in the Makefile
Martin Storsjö [Sat, 19 Nov 2011 08:02:15 +0000 (10:02 +0200)]
httpproxy: Specify the object files needed in the Makefile

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 20 Nov 2011 01:46:06 +0000 (02:46 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  swscale: Fix stack alignment for SSE
  avcodec: move some AVCodecContext fields to an internal struct.
  avcodec: use av_opt_set() instead of deprecated av_set_string3()
  avcodec: fix some const warnings
  avcodec: remove pointless AVOption, internal_buffer_count
  imgutils: Fix illegal read.

Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovsrc_mandelbrot: increase maxiter to 7189
Michael Niedermayer [Sat, 19 Nov 2011 22:52:29 +0000 (23:52 +0100)]
vsrc_mandelbrot: increase maxiter to 7189

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovsrc_mandelbrot: Use threshold to detect cycles.
Michael Niedermayer [Sat, 19 Nov 2011 22:28:56 +0000 (23:28 +0100)]
vsrc_mandelbrot: Use threshold to detect cycles.
This way cycles are detected much earlier.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovsrc_mandelbrot: detect edges in interpol()
Michael Niedermayer [Sat, 19 Nov 2011 21:22:21 +0000 (22:22 +0100)]
vsrc_mandelbrot: detect edges in interpol()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovsrc_mandelbrot: avoid a | in interpol()
Michael Niedermayer [Sat, 19 Nov 2011 21:07:10 +0000 (22:07 +0100)]
vsrc_mandelbrot: avoid a | in interpol()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavc: translate FF_ER_EXPLODE to AV_EF_EXPLODE|COMPLIANT
Michael Niedermayer [Sat, 19 Nov 2011 19:33:28 +0000 (20:33 +0100)]
lavc: translate FF_ER_EXPLODE to AV_EF_EXPLODE|COMPLIANT
This is most likely what the user wants.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovsrc_mandelbrot: increase default zoom speed by a factor of 2
Michael Niedermayer [Sat, 19 Nov 2011 18:42:24 +0000 (19:42 +0100)]
vsrc_mandelbrot: increase default zoom speed by a factor of 2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovsrc_mandelbrot: spatial interpolation
Michael Niedermayer [Sat, 19 Nov 2011 18:41:28 +0000 (19:41 +0100)]
vsrc_mandelbrot: spatial interpolation
speeds the code up by a factor of about 2-3.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoswscale: Fix stack alignment for SSE
John Stebbins [Fri, 18 Nov 2011 23:06:17 +0000 (15:06 -0800)]
swscale: Fix stack alignment for SSE

Although gcc guarantees 16 byte stack alignment, threads under WinXP
don't appear to be guaranteed to start stack aligned.  So fix the
alignment.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agoavcodec: move some AVCodecContext fields to an internal struct.
Justin Ruggles [Tue, 15 Nov 2011 20:34:50 +0000 (15:34 -0500)]
avcodec: move some AVCodecContext fields to an internal struct.

A new field, AVCodecContext.internal is used to hold a new struct
AVCodecInternal, which has private fields that are not codec-specific and are
used by general libavcodec functions.

Moved internal_buffer, internal_buffer_count, and is_copy.

9 years agovsrc_mandelbrot: always store values for periodicity checking, this avoids a few...
Michael Niedermayer [Sat, 19 Nov 2011 14:02:34 +0000 (15:02 +0100)]
vsrc_mandelbrot: always store values for periodicity checking, this avoids a few checks.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovsrc_mandelbrot: simplify second bailout search by not recalculating values.
Michael Niedermayer [Sat, 19 Nov 2011 14:00:26 +0000 (15:00 +0100)]
vsrc_mandelbrot: simplify second bailout search by not recalculating values.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovsrc_mandelbrot: increase zyklus array size so that optimizations can write a bit...
Michael Niedermayer [Sat, 19 Nov 2011 13:16:53 +0000 (14:16 +0100)]
vsrc_mandelbrot: increase zyklus array size so that optimizations can write a bit more.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovsrc_mandelbrot: check bailout only once every 8 iterations, this is around 10% faster.
Michael Niedermayer [Sat, 19 Nov 2011 13:15:56 +0000 (14:15 +0100)]
vsrc_mandelbrot: check bailout only once every 8 iterations, this is around 10% faster.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovsrc_mandelbrot: factorize periodicity checking too.
Michael Niedermayer [Sat, 19 Nov 2011 12:55:51 +0000 (13:55 +0100)]
vsrc_mandelbrot: factorize periodicity checking too.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovsrc_mandelbrot: factorize main calculation out into a macro.
Michael Niedermayer [Sat, 19 Nov 2011 12:51:44 +0000 (13:51 +0100)]
vsrc_mandelbrot: factorize main calculation out into a macro.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec: use av_opt_set() instead of deprecated av_set_string3()
Justin Ruggles [Sat, 19 Nov 2011 06:14:27 +0000 (01:14 -0500)]
avcodec: use av_opt_set() instead of deprecated av_set_string3()

9 years agoavcodec: fix some const warnings
Justin Ruggles [Sat, 19 Nov 2011 06:09:48 +0000 (01:09 -0500)]
avcodec: fix some const warnings

libavcodec/options.c:583: warning: assignment discards qualifiers from pointer
target type
libavcodec/options.c:589: warning: initialization discards qualifiers from
pointer target type

9 years agoavcodec: remove pointless AVOption, internal_buffer_count
Justin Ruggles [Sat, 19 Nov 2011 00:49:24 +0000 (19:49 -0500)]
avcodec: remove pointless AVOption, internal_buffer_count

9 years agoh261dec: correct AV_EF flags.
Michael Niedermayer [Sat, 19 Nov 2011 02:16:00 +0000 (03:16 +0100)]
h261dec: correct AV_EF flags.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agompeg12dec: correct AV_EF flags.
Michael Niedermayer [Sat, 19 Nov 2011 02:12:11 +0000 (03:12 +0100)]
mpeg12dec: correct AV_EF flags.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavc: remove incorrect mapping between semantically incompatible error recognization...
Michael Niedermayer [Sat, 19 Nov 2011 02:04:08 +0000 (03:04 +0100)]
lavc: remove incorrect mapping between semantically incompatible error recognization values and flags.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agompegaudeiodec: correct AV_EF flags.
Michael Niedermayer [Sat, 19 Nov 2011 02:03:21 +0000 (03:03 +0100)]
mpegaudeiodec: correct AV_EF flags.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavc: Add AV_EF flags to restore support for the error_resilience framework in the...
Michael Niedermayer [Sat, 19 Nov 2011 01:45:16 +0000 (02:45 +0100)]
lavc: Add AV_EF flags to restore support for the error_resilience framework in the new API.
The existing flags prior to this have a semantically different meaning and cannot be
used.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoimgutils: Fix illegal read.
Thierry Foucu [Sat, 19 Nov 2011 01:36:50 +0000 (17:36 -0800)]
imgutils: Fix illegal read.

Found with address sanitizer.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
9 years agoudp: update to new interrupt callback API
Michael Niedermayer [Sat, 19 Nov 2011 01:14:28 +0000 (02:14 +0100)]
udp: update to new interrupt callback API

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 19 Nov 2011 00:55:55 +0000 (01:55 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master: (22 commits)
  configure: add check for w32threads to enable it automatically
  rtmp: do not hardcode invoke numbers
  cinepack: return non-generic errors
  fate-lavf-ts: use -mpegts_transport_stream_id option.
  Add an APIchanges entry and a minor bump for avio changes.
  avio: Mark the old interrupt callback mechanism as deprecated
  avplay: Set the new interrupt callback
  avconv: Set new interrupt callbacks for all AVFormatContexts, use avio_open2() everywhere
  cinepak: remove redundant coordinate checks
  cinepak: check strip_size
  cinepak, simplify, use AV_RB24()
  cinepak: simplify, use FFMIN()
  cinepak: Fix division by zero, ask for sample if encoded_buf_size is 0
  applehttp: Fix seeking in streams not starting at DTS=0
  http: Don't use the normal http proxy mechanism for https
  tls: Handle connection via a http proxy
  http: Reorder two code blocks
  http: Add a new protocol for opening connections via http proxies
  http: Split out the non-chunked buffer reading part from http_read
  segafilm: add support for raw videos
  ...

Conflicts:
avconv.c
configure
doc/APIchanges
libavcodec/cinepak.c
libavformat/applehttp.c
libavformat/version.h
tests/lavf-regression.sh
tests/ref/lavf/ts

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavf: cdg has large non keyframe segments and should thus be exempt from the non...
Michael Niedermayer [Sat, 19 Nov 2011 00:15:40 +0000 (01:15 +0100)]
lavf: cdg has large non keyframe segments and should thus be exempt from the non keyframe check in seeking.
Improves seeking for cdg files.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoconfigure: add check for w32threads to enable it automatically
Janne Grunau [Tue, 1 Nov 2011 19:41:43 +0000 (20:41 +0100)]
configure: add check for w32threads to enable it automatically

9 years agorawdec: use a default sample rate if none is specified.
Michael Niedermayer [Fri, 18 Nov 2011 21:34:41 +0000 (22:34 +0100)]
rawdec: use a default sample rate if none is specified.
Fixes "ffmpeg -f s16le -i /dev/zero"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agosws: fix:
Michael Niedermayer [Fri, 18 Nov 2011 21:00:01 +0000 (22:00 +0100)]
sws: fix:
libswscale/swscale_unscaled.c:915:9: warning: new qualifiers in middle of multi-level non-const cast are unsafe

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agosws: Fix:
Michael Niedermayer [Fri, 18 Nov 2011 20:58:27 +0000 (21:58 +0100)]
sws: Fix:
libswscale/swscale_unscaled.c:805:5: warning: passing argument 1 of ‘check_image_pointers’ from incompatible pointer type
libswscale/swscale_unscaled.c:774:12: note: expected ‘uint8_t **’ but argument is of type ‘const uint8_t * const*’
libswscale/swscale_unscaled.c:809:5: warning: passing argument 1 of ‘check_image_pointers’ discards qualifiers from pointer target type
libswscale/swscale_unscaled.c:774:12: note: expected ‘uint8_t **’ but argument is of type ‘uint8_t * const*’

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agosws: Fix:
Michael Niedermayer [Fri, 18 Nov 2011 20:54:50 +0000 (21:54 +0100)]
sws: Fix:
libswscale/utils.c:941:13: warning: passing argument 5 of ‘initMMX2HScaler’ from incompatible pointer type
libswscale/utils.c:524:12: note: expected ‘int32_t *’ but argument is of type ‘int16_t *’
libswscale/utils.c:942:13: warning: passing argument 5 of ‘initMMX2HScaler’ from incompatible pointer type
libswscale/utils.c:524:12: note: expected ‘int32_t *’ but argument is of type ‘int16_t *’

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agosws: Fix warning: ‘abase’ may be used uninitialized in this function
Michael Niedermayer [Fri, 18 Nov 2011 20:51:29 +0000 (21:51 +0100)]
sws: Fix  warning: ‘abase’ may be used uninitialized in this function

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agosws: update copyright dates
Michael Niedermayer [Fri, 18 Nov 2011 20:44:26 +0000 (21:44 +0100)]
sws: update copyright dates

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoDon't fill in frame gaps with copied refs after flush
Joakim Plate [Fri, 18 Nov 2011 19:36:13 +0000 (20:36 +0100)]
Don't fill in frame gaps with copied refs after flush

The filled in refs cause corruptions in the video frame
for a long time after it should have recovered.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoqdm2dec: check remaining input bits in the mainloop of qdm2_fft_decode_tones()
Michael Niedermayer [Fri, 18 Nov 2011 16:56:24 +0000 (17:56 +0100)]
qdm2dec: check remaining input bits in the mainloop of qdm2_fft_decode_tones()
This is neccessary but likely not sufficient to prevent out of array reads.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavfi: reimplement MPlayer's af_pan filter for libavfilter.
Clément Bœsch [Sat, 5 Nov 2011 13:48:41 +0000 (14:48 +0100)]
lavfi: reimplement MPlayer's af_pan filter for libavfilter.

Original code by Clément Bœsch.
Parameters parsing and misc enhancements by Nicolas George.

9 years agomxfdec: Add hack that adjusts the n_delta calculation when system items are present
Tomas Härdin [Fri, 11 Nov 2011 14:01:34 +0000 (15:01 +0100)]
mxfdec: Add hack that adjusts the n_delta calculation when system items are present

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agomxfdec: Parse IndexTableSegments and convert them into AVIndexEntry arrays
Tomas Härdin [Wed, 9 Nov 2011 10:47:57 +0000 (11:47 +0100)]
mxfdec: Parse IndexTableSegments and convert them into AVIndexEntry arrays

Based on work by Georg Lippitsch <georg.lippitsch@gmx.at>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agortmp: do not hardcode invoke numbers
Josh Allmann [Sat, 12 Nov 2011 21:28:58 +0000 (13:28 -0800)]
rtmp: do not hardcode invoke numbers

Note: FCPublish/FCUnpublish are adobe server specific and not described
in the rtmp specification. Some servers might not cope with them at
all.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
9 years agocinepack: return non-generic errors
Luca Barbato [Fri, 18 Nov 2011 11:10:41 +0000 (12:10 +0100)]
cinepack: return non-generic errors

9 years agofate-lavf-ts: use -mpegts_transport_stream_id option.
Anton Khirnov [Mon, 14 Nov 2011 08:11:26 +0000 (09:11 +0100)]
fate-lavf-ts: use -mpegts_transport_stream_id option.

Serves as a test of muxer private options.

9 years agoAdd an APIchanges entry and a minor bump for avio changes.
Anton Khirnov [Sun, 13 Nov 2011 16:08:26 +0000 (17:08 +0100)]
Add an APIchanges entry and a minor bump for avio changes.

9 years agoavio: Mark the old interrupt callback mechanism as deprecated
Martin Storsjö [Mon, 7 Nov 2011 10:17:50 +0000 (12:17 +0200)]
avio: Mark the old interrupt callback mechanism as deprecated

Prepare for removing it at an upcoming major bump.

9 years agoavplay: Set the new interrupt callback
Martin Storsjö [Sun, 6 Nov 2011 21:28:49 +0000 (23:28 +0200)]
avplay: Set the new interrupt callback

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agoavconv: Set new interrupt callbacks for all AVFormatContexts, use avio_open2() everywhere
Martin Storsjö [Sun, 6 Nov 2011 21:22:04 +0000 (23:22 +0200)]
avconv: Set new interrupt callbacks for all AVFormatContexts, use avio_open2() everywhere

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agocinepak: remove redundant coordinate checks
Michael Niedermayer [Wed, 16 Nov 2011 16:25:39 +0000 (17:25 +0100)]
cinepak: remove redundant coordinate checks

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agocinepak: check strip_size
Michael Niedermayer [Wed, 16 Nov 2011 16:21:42 +0000 (17:21 +0100)]
cinepak: check strip_size

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agocinepak, simplify, use AV_RB24()
Michael Niedermayer [Wed, 16 Nov 2011 16:16:38 +0000 (17:16 +0100)]
cinepak, simplify, use AV_RB24()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agocinepak: simplify, use FFMIN()
Michael Niedermayer [Wed, 16 Nov 2011 16:15:15 +0000 (17:15 +0100)]
cinepak: simplify, use FFMIN()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agocinepak: Fix division by zero, ask for sample if encoded_buf_size is 0
Michael Niedermayer [Wed, 16 Nov 2011 14:10:26 +0000 (15:10 +0100)]
cinepak: Fix division by zero, ask for sample if encoded_buf_size is 0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agoapplehttp: Fix seeking in streams not starting at DTS=0
Panagiotis H.M. Issaris [Tue, 15 Nov 2011 17:35:03 +0000 (18:35 +0100)]
applehttp: Fix seeking in streams not starting at DTS=0

The Apple HTTP Live Streaming demuxer's implementation of
seeking searches for the MPEG TS segment which contains the
requested timestamp.  In its current implementation it assumes
that the first segment will start from 0.

But, MPEG TS streams do not necessarily start with timestamp
(near) 0, causing seeking to fail for those streams.

This also occurs when using live streaming of HTTP Live Streams.
In this case sliding playlists may be used, which means that in
that case only the last x encoded segments are stored, the earlier
segments get deleted from disk and removed from the playlist.
Because of this, when starting playback of a stream in the middle
of such a broadcast, the initial segment fetched after parsing
the m3u8 playlist will not start from timestamp (near) 0, causing
(the admittedly limited live) seeking to fail.

This patch changes this demuxers seeking implementation to use
the initial DTS as an offset for searching the segments containing
the requested timestamp.

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agoffprobe: make writer_print_integer support long long int values
Stefano Sabatini [Mon, 7 Nov 2011 14:58:41 +0000 (15:58 +0100)]
ffprobe: make writer_print_integer support long long int values

This makes possible to use writer_print_integer for printing int64_t
values.

9 years agohttp: Don't use the normal http proxy mechanism for https
Martin Storsjö [Thu, 10 Nov 2011 12:57:15 +0000 (14:57 +0200)]
http: Don't use the normal http proxy mechanism for https

The tls protocol handles connections via proxies internally.

With TLS/SSL, the peer verification requires that the client
speaks directly with the server, since the proxy doesn't have
the remote server's private key.

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agotls: Handle connection via a http proxy
Martin Storsjö [Thu, 10 Nov 2011 13:26:23 +0000 (15:26 +0200)]
tls: Handle connection via a http proxy

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agohttp: Reorder two code blocks
Martin Storsjö [Thu, 10 Nov 2011 12:55:18 +0000 (14:55 +0200)]
http: Reorder two code blocks

This is in preparation for a later commit.

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agohttp: Add a new protocol for opening connections via http proxies
Martin Storsjö [Thu, 10 Nov 2011 12:53:16 +0000 (14:53 +0200)]
http: Add a new protocol for opening connections via http proxies

This opens a plain TCP connection through the proxy via the
CONNECT HTTP method. Normally, this is allowed for connections
on port 443, but can in general be used to allow connections
to any port (depending on proxy configuration), and could thus
be used to tunnel any TCP connection via a HTTP proxy.

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agohttp: Split out the non-chunked buffer reading part from http_read
Martin Storsjö [Thu, 10 Nov 2011 12:52:50 +0000 (14:52 +0200)]
http: Split out the non-chunked buffer reading part from http_read

This is in preparation for a later commit, where this function
is reused.

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agosegafilm: add support for raw videos
Matthew Hoops [Tue, 15 Nov 2011 01:08:50 +0000 (20:08 -0500)]
segafilm: add support for raw videos

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agortpdec: only use RTCP for PTS when synchronizing multiple streams
John Brooks [Wed, 9 Nov 2011 23:28:35 +0000 (16:28 -0700)]
rtpdec: only use RTCP for PTS when synchronizing multiple streams

RTCP timestamps are only necessary to synchronize time between
multiple streams. For a single stream, the RTP packet timestamp
provides more reliable timing. As a result, single-stream RTP
sessions should now have accurate and monotonic PTS.

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agortpdec: unwrap RTP timestamps for PTS calculation
John Brooks [Thu, 17 Nov 2011 15:50:12 +0000 (08:50 -0700)]
rtpdec: unwrap RTP timestamps for PTS calculation

The timestamp field in RTPDemuxContext was unused before this.

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 18 Nov 2011 01:55:19 +0000 (02:55 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vp5: Fix illegal read.
  vp6: Fix illegal read.
  tls: Use TLSv1_client_method for OpenSSL

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoj2kdec: fix 10l typo in initializing sgnd.
Michael Niedermayer [Fri, 18 Nov 2011 01:35:49 +0000 (02:35 +0100)]
j2kdec: fix 10l typo in initializing sgnd.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoAdded support for J2K encoding with libopenjpeg
Michael Bradshaw [Thu, 17 Nov 2011 23:57:09 +0000 (16:57 -0700)]
Added support for J2K encoding with libopenjpeg

Note: Some of the previous patches have had two bugs that have been fixed
in this patch.

Signed-off-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovf_scale: Fix slice position assert to take vertical subsampling into account.
Michael Niedermayer [Thu, 17 Nov 2011 21:39:46 +0000 (22:39 +0100)]
vf_scale: Fix slice position assert to take vertical subsampling into account.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agosws: handle jpeg pixel formats in sws_init_context()
Michael Niedermayer [Thu, 17 Nov 2011 20:51:25 +0000 (21:51 +0100)]
sws: handle jpeg pixel formats in sws_init_context()
Fixes Ticket576

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolibutvideo: use K&R style.
Clément Bœsch [Mon, 14 Nov 2011 23:06:02 +0000 (00:06 +0100)]
libutvideo: use K&R style.

9 years agovp5: Fix illegal read.
Alex Converse [Thu, 17 Nov 2011 18:06:14 +0000 (10:06 -0800)]
vp5: Fix illegal read.

Found with Address Sanitizer

9 years agovp6: Fix illegal read.
Thierry Foucu [Thu, 17 Nov 2011 17:39:52 +0000 (09:39 -0800)]
vp6: Fix illegal read.

Found with Address Sanitizer

Signed-off-by: Alex Converse <alex.converse@gmail.com>
9 years agoac3probe: Detect Sonic Foundry Soft Encode AC3 as raw AC3.
Michael Niedermayer [Thu, 17 Nov 2011 18:38:47 +0000 (19:38 +0100)]
ac3probe: Detect Sonic Foundry Soft Encode AC3 as raw AC3.
Our ac3 code chain can handle it fine.
More ideal would be to write a demuxer that actually extracts what can be from the additional
headers and uses it for whatever it can be used for.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>