ffmpeg.git
9 years agovda: use fast reallocation.
Sebastien Zwickert [Fri, 11 Nov 2011 02:38:13 +0000 (03:38 +0100)]
vda: use fast reallocation.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agosws: Fix compilation with disabled MMX2
Michael Niedermayer [Fri, 11 Nov 2011 14:54:08 +0000 (15:54 +0100)]
sws: Fix compilation with disabled MMX2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffprobe: use av_noreturn
Michael Niedermayer [Fri, 11 Nov 2011 03:26:07 +0000 (04:26 +0100)]
ffprobe: use av_noreturn

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffserver: use av_noreturn
Michael Niedermayer [Fri, 11 Nov 2011 03:25:53 +0000 (04:25 +0100)]
ffserver: use av_noreturn

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffplay: use av_noreturn
Michael Niedermayer [Fri, 11 Nov 2011 03:25:35 +0000 (04:25 +0100)]
ffplay: use av_noreturn

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffmpeg: use av_noreturn
Michael Niedermayer [Fri, 11 Nov 2011 03:24:25 +0000 (04:24 +0100)]
ffmpeg: use av_noreturn

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavutil: add av_noreturn
Michael Niedermayer [Fri, 11 Nov 2011 03:24:00 +0000 (04:24 +0100)]
avutil: add av_noreturn

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffmpeg: check debug scanf() return value.
Michael Niedermayer [Fri, 11 Nov 2011 03:05:25 +0000 (04:05 +0100)]
ffmpeg: check debug scanf() return value.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffmpeg: get rid of deprecated warnings due to AVOption useage.
Michael Niedermayer [Fri, 11 Nov 2011 02:57:46 +0000 (03:57 +0100)]
ffmpeg: get rid of deprecated warnings due to AVOption useage.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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()
(cherry picked from commit 9ebc93fa4623791eca9efeee4de65b23dc015de1)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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
(cherry picked from commit 69bca779e5d8409cde336406a26b5173002cac97)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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
(cherry picked from commit 9e2ccb2de8d4dc5179cd86610b129500e6223be7)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoLog tile size
Mashiat Sarker Shakkhar [Thu, 10 Nov 2011 06:03:51 +0000 (12:03 +0600)]
Log tile size
(cherry picked from commit 257e5c4829cd916938c9e1922e50668636346f71)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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()
(cherry picked from commit 17219c79360bc2bdaf3e7f47178af42fade140a8)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoImplement lms_predict()
Mashiat Sarker Shakkhar [Sat, 5 Nov 2011 21:02:11 +0000 (03:02 +0600)]
Implement lms_predict()
(cherry picked from commit 83e31db195b9d0a07b0526eab5780817d8ce9444)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoImplement reset_codec()
Mashiat Sarker Shakkhar [Sat, 5 Nov 2011 21:00:49 +0000 (03:00 +0600)]
Implement reset_codec()
(cherry picked from commit c56313aa7969691f1a779e5ac5666f012676836f)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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
(cherry picked from commit 2d6ca09c0f6ea318e439b9b073f507c802623ced)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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
(cherry picked from commit a7820f3c5a0f4d2a5f005f9ca3766d29b2111380)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoAnalysis and spec comparison
Mashiat Sarker Shakkhar [Fri, 4 Nov 2011 20:23:06 +0000 (02:23 +0600)]
Analysis and spec comparison
(cherry picked from commit 6b05ea8b690ecab0e98924f0887f24311843d080)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoImplement clear_codec_buffers()
Mashiat Sarker Shakkhar [Fri, 4 Nov 2011 20:19:35 +0000 (02:19 +0600)]
Implement clear_codec_buffers()
(cherry picked from commit d34e3cf342219e9825125d4f9327cf1feab15c79)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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 agoAnalysis and spec comparison
Mashiat Sarker Shakkhar [Fri, 4 Nov 2011 19:24:29 +0000 (01:24 +0600)]
Analysis and spec comparison

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

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

* qatar/master: (29 commits)
  doc: update libavfilter documentation
  tls: Use the URLContext as logging context
  aes: Avoid illegal read and don't generate more key than we use.
  mpc7: Fix memset call in mpc7_decode_frame function
  atrac1: use correct context for av_log()
  apedec: consume the whole packet when copying to the decoder buffer.
  apedec: do not needlessly copy s->samples to nblocks.
  apedec: check output buffer size after calculating actual output size
  apedec: remove unneeded entropy decoder normalization.
  truespeech: use memmove() in truespeech_update_filters()
  vorbisdec: remove AVCODEC_MAX_AUDIO_FRAME_SIZE check
  vorbisdec: remove unneeded buf_size==0 check
  vorbisdec: return proper error codes instead of made-up ones
  http: Don't add a Range: bytes=0- header for POST
  sunrast: Check for invalid/corrupted bitstream
  http: Change the chunksize AVOption into chunked_post
  http: Add encoding/decoding flags to the AVOptions
  avconv: remove some codec-specific hacks
  crypto: add decoding flag to options.
  tls: use AVIO_FLAG_NONBLOCK instead of deprecated URL_FLAG_NONBLOCK
  ...

Conflicts:
doc/libavfilter.texi
libavcodec/atrac1.c
libavcodec/sunrast.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agodoc: update libavfilter documentation
Luca Barbato [Tue, 8 Nov 2011 19:37:58 +0000 (11:37 -0800)]
doc: update libavfilter documentation

Update the reference to the conversion tool to use avconv and
make sure the example line works as supposed.
Remove the paragraph pointing to the svn repo

9 years agocook: fix apparent typo in extradata parsing
K.Y.H [Thu, 10 Nov 2011 23:30:39 +0000 (00:30 +0100)]
cook: fix apparent typo in extradata parsing

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agogolomb: Fix overread in get_ur_golomb_jpegls()
Nir Ben David [Thu, 10 Nov 2011 22:03:48 +0000 (23:03 +0100)]
golomb: Fix overread in get_ur_golomb_jpegls()
Fixes Ticket600

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agodoc: update examples to use -b:v or -b:a
Lou Logan [Thu, 10 Nov 2011 21:11:33 +0000 (12:11 -0900)]
doc: update examples to use -b:v or -b:a
Fixes Ticket613

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoFix some 1bit bmp samples, they are palletised.
Carl Eugen Hoyos [Thu, 10 Nov 2011 22:07:27 +0000 (23:07 +0100)]
Fix some 1bit bmp samples, they are palletised.

Fixes ticket #632.

9 years agotls: Use the URLContext as logging context
Martin Storsjö [Thu, 10 Nov 2011 15:52:38 +0000 (17:52 +0200)]
tls: Use the URLContext as logging context

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agoaes: Avoid illegal read and don't generate more key than we use.
Alex Converse [Fri, 4 Nov 2011 01:13:57 +0000 (18:13 -0700)]
aes: Avoid illegal read and don't generate more key than we use.

9 years agompc7: Fix memset call in mpc7_decode_frame function
Alex Converse [Wed, 9 Nov 2011 21:40:44 +0000 (13:40 -0800)]
mpc7: Fix memset call in mpc7_decode_frame function

9 years agoatrac1: use correct context for av_log()
Justin Ruggles [Wed, 2 Nov 2011 16:06:04 +0000 (12:06 -0400)]
atrac1: use correct context for av_log()

9 years agoapedec: consume the whole packet when copying to the decoder buffer.
Justin Ruggles [Mon, 31 Oct 2011 18:49:34 +0000 (14:49 -0400)]
apedec: consume the whole packet when copying to the decoder buffer.

This avoids artifically consuming a partial packet but ignoring remaining data
in subsequent calls.

9 years agoapedec: do not needlessly copy s->samples to nblocks.
Justin Ruggles [Mon, 31 Oct 2011 19:10:19 +0000 (15:10 -0400)]
apedec: do not needlessly copy s->samples to nblocks.

also move nblocks to the local scope where it is used.

9 years agoapedec: check output buffer size after calculating actual output size
Justin Ruggles [Mon, 31 Oct 2011 19:03:14 +0000 (15:03 -0400)]
apedec: check output buffer size after calculating actual output size

9 years agoapedec: remove unneeded entropy decoder normalization.
Justin Ruggles [Mon, 31 Oct 2011 18:57:04 +0000 (14:57 -0400)]
apedec: remove unneeded entropy decoder normalization.

The decoder already skips data at the end of the packet without this.
Also remove 2 APEContext fields that were only used for the end-of-frame
normalization.

9 years agotruespeech: use memmove() in truespeech_update_filters()
Justin Ruggles [Sat, 29 Oct 2011 22:25:40 +0000 (18:25 -0400)]
truespeech: use memmove() in truespeech_update_filters()

9 years agovorbisdec: remove AVCODEC_MAX_AUDIO_FRAME_SIZE check
Justin Ruggles [Sun, 30 Oct 2011 22:41:00 +0000 (18:41 -0400)]
vorbisdec: remove AVCODEC_MAX_AUDIO_FRAME_SIZE check

The user could provide a larger buffer, which is already checked separately
before writing output.

9 years agovorbisdec: remove unneeded buf_size==0 check
Justin Ruggles [Sun, 30 Oct 2011 22:40:21 +0000 (18:40 -0400)]
vorbisdec: remove unneeded buf_size==0 check

9 years agovorbisdec: return proper error codes instead of made-up ones
Justin Ruggles [Sun, 30 Oct 2011 22:38:19 +0000 (18:38 -0400)]
vorbisdec: return proper error codes instead of made-up ones

9 years agoffmpeg: update timestamping code to handle frame threads
Michael Niedermayer [Thu, 10 Nov 2011 13:59:00 +0000 (14:59 +0100)]
ffmpeg: update timestamping code to handle frame threads

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agompeg4videodec: fix lml4 and frame threading without -vsync 0
Michael Niedermayer [Thu, 10 Nov 2011 12:51:38 +0000 (13:51 +0100)]
mpeg4videodec: fix lml4 and frame threading without -vsync 0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agohttp: Don't add a Range: bytes=0- header for POST
Martin Storsjö [Thu, 10 Nov 2011 09:09:26 +0000 (11:09 +0200)]
http: Don't add a Range: bytes=0- header for POST

That header simply doesn't make sense in that context.

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agosunrast: Check for invalid/corrupted bitstream
Laurent Aimar [Tue, 27 Sep 2011 22:15:32 +0000 (22:15 +0000)]
sunrast: Check for invalid/corrupted bitstream

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agohttp: Change the chunksize AVOption into chunked_post
Martin Storsjö [Thu, 10 Nov 2011 09:03:35 +0000 (11:03 +0200)]
http: Change the chunksize AVOption into chunked_post

The chunksize internal variable has two different uses - for
reading, it's the amount of data left of the current chunk
(or -1 if the server doesn't send data in chunked mode), where
it's only an internal state variable. For writing, it's used
to decide whether to enable chunked encoding (by default), by
using the value 0, or disable chunked encoding (value -1).

This, while consistent, doesn't make much sense to expose
as an AVOption. This splits the usage of the internal variable
into two variables, chunksize which is used for reading (as
before), and chunked_post which is the user-settable option,
with the values 0 and 1, where 1 is default.

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agohttp: Add encoding/decoding flags to the AVOptions
Anton Khirnov [Thu, 10 Nov 2011 08:34:58 +0000 (09:34 +0100)]
http: Add encoding/decoding flags to the AVOptions

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agoavconv: remove some codec-specific hacks
Anton Khirnov [Wed, 9 Nov 2011 20:16:27 +0000 (21:16 +0100)]
avconv: remove some codec-specific hacks

The problem they are supposed to fix is handled in riff.c, so those
hacks are pointless.

9 years agocrypto: add decoding flag to options.
Anton Khirnov [Sat, 5 Nov 2011 13:07:13 +0000 (14:07 +0100)]
crypto: add decoding flag to options.

9 years agotls: use AVIO_FLAG_NONBLOCK instead of deprecated URL_FLAG_NONBLOCK
Anton Khirnov [Sat, 5 Nov 2011 11:48:02 +0000 (12:48 +0100)]
tls: use AVIO_FLAG_NONBLOCK instead of deprecated URL_FLAG_NONBLOCK

9 years agohttp: use different classes for http and https.
Anton Khirnov [Sat, 5 Nov 2011 11:54:01 +0000 (12:54 +0100)]
http: use different classes for http and https.

9 years agohttp: Change an error log message to a warning
Martin Storsjö [Tue, 8 Nov 2011 23:14:05 +0000 (01:14 +0200)]
http: Change an error log message to a warning

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agohttp: Remove the now unused ff_http_set_headers custom function
Martin Storsjö [Mon, 7 Nov 2011 09:46:29 +0000 (11:46 +0200)]
http: Remove the now unused ff_http_set_headers custom function

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agomms: Set http custom headers via the AVOption
Martin Storsjö [Mon, 7 Nov 2011 09:48:51 +0000 (11:48 +0200)]
mms: Set http custom headers via the AVOption

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agortsp: Set http custom headers via the AVOption
Martin Storsjö [Mon, 7 Nov 2011 09:45:57 +0000 (11:45 +0200)]
rtsp: Set http custom headers via the AVOption

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agohttp: Make custom headers settable via an AVOption
Martin Storsjö [Mon, 7 Nov 2011 09:43:13 +0000 (11:43 +0200)]
http: Make custom headers settable via an AVOption

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agocrypto: Don't manually free memory allocated via AVOptions
Martin Storsjö [Tue, 8 Nov 2011 22:50:37 +0000 (00:50 +0200)]
crypto: Don't manually free memory allocated via AVOptions

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agoavio: Free URLContext private data allocated via AVOptions
Martin Storsjö [Tue, 8 Nov 2011 22:48:40 +0000 (00:48 +0200)]
avio: Free URLContext private data allocated via AVOptions

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agoavc: fix memory errors when encoding invalid h264 codecdata
John Brooks [Thu, 10 Nov 2011 03:14:19 +0000 (20:14 -0700)]
avc: fix memory errors when encoding invalid h264 codecdata

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agolavc: update AVCodecContext.delay documentation
Michael Niedermayer [Thu, 10 Nov 2011 04:04:17 +0000 (05:04 +0100)]
lavc: update AVCodecContext.delay documentation

Based on reimars suggestion
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agopthreads: export the delay that was previously exported by mangling has_b_frames...
Michael Niedermayer [Wed, 9 Nov 2011 17:32:38 +0000 (18:32 +0100)]
pthreads: export the delay that was previously exported by mangling has_b_frames through
AVCodecContext.delay which was previously unused for decoders and fits better.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 10 Nov 2011 02:09:46 +0000 (03:09 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avcodec: add support for planar signed 8-bit PCM.
  ra144enc: add sample_fmts list to ff_ra_144_encoder
  smackaud: use uint8_t* for 8-bit output buffer type
  smackaud: clip output samples
  smackaud: use sign_extend() for difference value instead of casting
  sipr: use a function pointer to select the decode_frame function
  sipr: set mode based on block_align instead of bit_rate
  sipr: do not needlessly set *data_size to 0 when returning an error
  ra288: fix formatting of LOCAL_ALIGNED_16
  udp: Allow specifying the local IP address
  VC1: Add bottom field offset to block_index[] to avoid rewriting (+10L)
  vc1dec: move an if() block.
  vc1dec: use correct hybrid prediction threshold.
  vc1dec: Partial rewrite of vc1_pred_mv()
  vc1dec: take ME precision into account while scaling MV predictors.
  lavf: don't leak corrupted packets

Conflicts:
libavcodec/8svx.c
libavcodec/ra288.c
libavcodec/version.h
libavformat/iff.c
libavformat/udp.c
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovf_fade: reindent after previous commit
Stefano Sabatini [Wed, 9 Nov 2011 00:36:50 +0000 (01:36 +0100)]
vf_fade: reindent after previous commit

9 years agovf_fade: add alpha option and alpha fading support
Mark Himsley [Wed, 9 Nov 2011 00:35:31 +0000 (01:35 +0100)]
vf_fade: add alpha option and alpha fading support

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
9 years agovf_fade: add support to options parsing
Mark Himsley [Wed, 9 Nov 2011 00:17:55 +0000 (01:17 +0100)]
vf_fade: add support to options parsing

Extend fade syntax, required by a pending patch.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
9 years agoavcodec: add support for planar signed 8-bit PCM.
Justin Ruggles [Mon, 31 Oct 2011 17:41:47 +0000 (13:41 -0400)]
avcodec: add support for planar signed 8-bit PCM.

It is found in some 8svx files (e.g. ones created by SoX).
Currently the decoder reuses the 8svx functions because we already have
handling of a single large planar packet for the compressed 8svx codecs.

9 years agolowercase FRWU string
ami_stuff [Wed, 9 Nov 2011 22:04:22 +0000 (23:04 +0100)]
lowercase FRWU string

8556406d38dc2307dd3f187c4528d64f5c350d5f (lavc: lowercase the FRWU codec name)
got partially reverted by ec6402b7c595c3ceed6d1b8c1b75c6aa8336e052
(lavc: use designated initialisers for all codecs.)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agora144enc: add sample_fmts list to ff_ra_144_encoder
Justin Ruggles [Tue, 8 Nov 2011 22:47:09 +0000 (17:47 -0500)]
ra144enc: add sample_fmts list to ff_ra_144_encoder

This enables the user (i.e. avconv) to automatically convert to the supported
sample format if needed.

9 years agosmackaud: use uint8_t* for 8-bit output buffer type
Justin Ruggles [Wed, 9 Nov 2011 21:21:08 +0000 (16:21 -0500)]
smackaud: use uint8_t* for 8-bit output buffer type

This matches the output sample format and the range of the output values.

9 years agosmackaud: clip output samples
Justin Ruggles [Wed, 9 Nov 2011 21:20:45 +0000 (16:20 -0500)]
smackaud: clip output samples

9 years agosmackaud: use sign_extend() for difference value instead of casting
Justin Ruggles [Wed, 9 Nov 2011 21:19:52 +0000 (16:19 -0500)]
smackaud: use sign_extend() for difference value instead of casting

9 years agovda: set destination image buffer attributes.
Sebastien Zwickert [Wed, 9 Nov 2011 20:08:09 +0000 (21:08 +0100)]
vda: set destination image buffer attributes.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoaudioconvert: make av_get_channel_layout accept composite names.
Nicolas George [Tue, 8 Nov 2011 15:32:50 +0000 (16:32 +0100)]
audioconvert: make av_get_channel_layout accept composite names.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agosipr: use a function pointer to select the decode_frame function
Justin Ruggles [Fri, 4 Nov 2011 02:10:15 +0000 (22:10 -0400)]
sipr: use a function pointer to select the decode_frame function

9 years agosipr: set mode based on block_align instead of bit_rate
Justin Ruggles [Sat, 29 Oct 2011 05:20:39 +0000 (01:20 -0400)]
sipr: set mode based on block_align instead of bit_rate

the user is not required to set bit_rate

9 years agosipr: do not needlessly set *data_size to 0 when returning an error
Justin Ruggles [Sat, 29 Oct 2011 04:49:38 +0000 (00:49 -0400)]
sipr: do not needlessly set *data_size to 0 when returning an error

9 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Wed, 9 Nov 2011 19:51:39 +0000 (20:51 +0100)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: limit lowres to the maximum supported. Fixes Ticket591

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agora288: fix formatting of LOCAL_ALIGNED_16
Justin Ruggles [Wed, 9 Nov 2011 18:45:50 +0000 (13:45 -0500)]
ra288: fix formatting of LOCAL_ALIGNED_16

9 years agofraps: check overread per sample instead of per line
Michael Niedermayer [Wed, 9 Nov 2011 18:40:59 +0000 (19:40 +0100)]
fraps: check overread per sample instead of per line

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agofraps: fix memleak
Michael Niedermayer [Wed, 9 Nov 2011 18:33:33 +0000 (19:33 +0100)]
fraps: fix memleak

Found-by reimar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoudp: Allow specifying the local IP address
Martin Storsjö [Wed, 9 Nov 2011 09:45:01 +0000 (11:45 +0200)]
udp: Allow specifying the local IP address

This is useful if sending multicast data on a host with
multiple interfaces.

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agoRevert commit 0bc391281ad80d4eb365f3d8978637b07003e8dc
Michael Niedermayer [Wed, 9 Nov 2011 17:58:07 +0000 (18:58 +0100)]
Revert  commit 0bc391281ad80d4eb365f3d8978637b07003e8dc
        ffmpeg: remove -psnr option.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agopthreads: drop has_b_frames mangling, its buggy in many many ways,
Michael Niedermayer [Wed, 9 Nov 2011 16:26:19 +0000 (17:26 +0100)]
pthreads: drop has_b_frames mangling, its buggy in many many ways,
not to mention race conditions and that its used for stream copy, used to determine IPB type by
applications and other things.
Fixes various frame drop/timestamp issues with frame multithreading.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoCheck extradata_size before accessing extradata.
Carl Eugen Hoyos [Wed, 9 Nov 2011 13:04:22 +0000 (14:04 +0100)]
Check extradata_size before accessing extradata.

Fixes ticket #627.

9 years agoVC1: Add bottom field offset to block_index[] to avoid rewriting (+10L)
shahriman AMS [Tue, 8 Nov 2011 08:51:45 +0000 (08:51 +0000)]
VC1: Add bottom field offset to block_index[] to avoid rewriting (+10L)

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agovc1dec: move an if() block.
shahriman AMS [Tue, 8 Nov 2011 08:47:33 +0000 (08:47 +0000)]
vc1dec: move an if() block.

There are no reason for "if (c_valid) { ... }" to appear before
"if (b_valid) { ... }".

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agovc1dec: use correct hybrid prediction threshold.
shahriman AMS [Tue, 8 Nov 2011 08:47:32 +0000 (08:47 +0000)]
vc1dec: use correct hybrid prediction threshold.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agovc1dec: Partial rewrite of vc1_pred_mv()
shahriman AMS [Tue, 8 Nov 2011 08:47:31 +0000 (08:47 +0000)]
vc1dec: Partial rewrite of vc1_pred_mv()

The current code is a generalization of the earlier progressive MV
prediction code. This was supposed to predict MVs for both interlaced
and progressive pictures. But the interlaced MV prediction is buggy
and works mostly by luck.

This partially fixes interlaced MV prediction.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agovc1dec: take ME precision into account while scaling MV predictors.
shahriman AMS [Tue, 8 Nov 2011 08:47:30 +0000 (08:47 +0000)]
vc1dec: take ME precision into account while scaling MV predictors.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agolavf: don't leak corrupted packets
Andrey Utkin [Tue, 8 Nov 2011 15:24:04 +0000 (17:24 +0200)]
lavf: don't leak corrupted packets

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agora288: try to fix 10l typo that breaks compile on some platforms
Michael Niedermayer [Wed, 9 Nov 2011 03:53:33 +0000 (04:53 +0100)]
ra288: try to fix 10l typo that breaks compile on some platforms

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoudp: simplify 7a032cb97f743a651138d2da6214c79e0ce089dd
Michael Niedermayer [Wed, 9 Nov 2011 02:51:08 +0000 (03:51 +0100)]
udp: simplify 7a032cb97f743a651138d2da6214c79e0ce089dd

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoFix segfault on UDP reading
Andrey Utkin [Thu, 3 Nov 2011 07:00:15 +0000 (07:00 +0000)]
Fix segfault on UDP reading

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

* qatar/master:
  tls: Use ERR_get_error() in do_tls_poll
  indeo3: Fix a fencepost error.
  mxfdec: Fix comparison of unsigned expression < 0.
  mpegts: set stream id on just created stream, not an unrelated variable
  ra288: return error if input buffer is too small
  ra288: utilize DSPContext.vector_fmul()
  ra288: use memcpy() to copy decoded samples to output
  mace: only calculate output buffer size once
  Remove redundant filename self-references inside files.
  indeo3data: add missing config.h #include for HAVE_BIGENDIAN
  x86: drop pointless ARCH_X86 #ifdef from files in x86 subdirectory
  avplay: reset rdft when closing stream.
  doc/git-howto: expand format-patch and send-email notes.
  lavf: expand doxy for some AVFormatContext fields.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoUse more accurate conversion for rgb15/16 to rgb24/32 (C/MMX).
Themaister [Tue, 8 Nov 2011 15:16:59 +0000 (16:16 +0100)]
Use more accurate conversion for rgb15/16 to rgb24/32 (C/MMX).
Fate update by michael.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agofraps: check for overread
Michael Niedermayer [Tue, 8 Nov 2011 21:42:50 +0000 (22:42 +0100)]
fraps: check for overread
Fixeds Ticket619

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agompegvideo_probe: reduce score for invalid streams
Michael Niedermayer [Tue, 8 Nov 2011 21:24:55 +0000 (22:24 +0100)]
mpegvideo_probe: reduce score for invalid streams

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffplay: limit lowres to the maximum supported. Fixes Ticket591
Michael Niedermayer [Tue, 8 Nov 2011 02:14:13 +0000 (03:14 +0100)]
ffplay: limit lowres to the maximum supported. Fixes Ticket591

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>