ffmpeg.git
7 years agolavc/h264_mp4toannexb: improve feedback in case of invalid bitstream
Stefano Sabatini [Sun, 14 Jul 2013 16:26:00 +0000 (18:26 +0200)]
lavc/h264_mp4toannexb: improve feedback in case of invalid bitstream

7 years agoavcodec/avutil: Add AVColorSpace and AVColorRange to AVFrames
Michael Niedermayer [Sun, 14 Jul 2013 17:13:46 +0000 (19:13 +0200)]
avcodec/avutil: Add AVColorSpace and AVColorRange to AVFrames

This also moves AVColorSpace and AVColorRange from avcodec to avutil

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavc/avcodec.h: fix various typos in av_bitstream_filter_filter() docs
Stefano Sabatini [Tue, 16 Jul 2013 17:10:28 +0000 (19:10 +0200)]
lavc/avcodec.h: fix various typos in av_bitstream_filter_filter() docs

7 years agomatroskaenc: use ffio_fill()
Paul B Mahol [Mon, 15 Jul 2013 20:20:57 +0000 (20:20 +0000)]
matroskaenc: use ffio_fill()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agomastroka audio muxer: Set long_name to Matroska Audio so that it differs from the...
Alexis Ballier [Tue, 16 Jul 2013 00:36:31 +0000 (20:36 -0400)]
mastroka audio muxer: Set long_name to Matroska Audio so that it differs from the long_name of matroska video.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswscale: move default colorspace setup to sws_init_filter()
Michael Niedermayer [Sun, 14 Jul 2013 03:19:45 +0000 (05:19 +0200)]
swscale: move default colorspace setup to sws_init_filter()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 15 Jul 2013 22:39:33 +0000 (00:39 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavf: Make sure avg_frame_rate can be calculated without integer overflow

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '31931520df35a6f9606fe8293c8a39e2d1fabedf'
Michael Niedermayer [Mon, 15 Jul 2013 22:08:10 +0000 (00:08 +0200)]
Merge commit '31931520df35a6f9606fe8293c8a39e2d1fabedf'

* commit '31931520df35a6f9606fe8293c8a39e2d1fabedf':
  mov: Do not allow updating the time scale after it has been set

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '5b4eb243bce10a3e8345401a353749e0414c54ca'
Michael Niedermayer [Mon, 15 Jul 2013 21:58:38 +0000 (23:58 +0200)]
Merge commit '5b4eb243bce10a3e8345401a353749e0414c54ca'

* commit '5b4eb243bce10a3e8345401a353749e0414c54ca':
  mov: Seek back if overreading an individual atom

Conflicts:
libavformat/mov.c
See: 6093960ae35c8d69c559b5604f683c2ea3f279ca
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '8f24c12be7a3b3ea105e67bba9a867fe210a2333'
Michael Niedermayer [Mon, 15 Jul 2013 21:38:51 +0000 (23:38 +0200)]
Merge commit '8f24c12be7a3b3ea105e67bba9a867fe210a2333'

* commit '8f24c12be7a3b3ea105e67bba9a867fe210a2333':
  ac3dec: Don't consume more data than the actual input packet size

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf: Make sure avg_frame_rate can be calculated without integer overflow
Martin Storsjö [Mon, 15 Jul 2013 13:44:20 +0000 (16:44 +0300)]
lavf: Make sure avg_frame_rate can be calculated without integer overflow

If either of the deltas is too large for the multiplications to
succeed, don't use this for setting the avg frame rate.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Cc: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agomov: Do not allow updating the time scale after it has been set
Martin Storsjö [Mon, 15 Jul 2013 14:13:54 +0000 (17:13 +0300)]
mov: Do not allow updating the time scale after it has been set

The time scale is set in mdhd, and later validated in the
enclosing trak atom once all of its children have been parsed.

A loose mdhd atom outside of a trak atom could update the time
scale of the last stream without any validation.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Cc: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agomov: Seek back if overreading an individual atom
Martin Storsjö [Mon, 15 Jul 2013 12:59:50 +0000 (15:59 +0300)]
mov: Seek back if overreading an individual atom

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Cc: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoac3dec: Don't consume more data than the actual input packet size
Martin Storsjö [Mon, 15 Jul 2013 08:28:46 +0000 (11:28 +0300)]
ac3dec: Don't consume more data than the actual input packet size

This was handled properly in the normal return case at the end
of the function, but not in this special case.

Returning a value larger than the input packet size can cause
problems for certain library users.

Returning the actual input buffer size unconditionally, since
it is not guaranteed that frame_size is set to a sensible
value at this point.

Cc: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agomxfenc: use ffio_fill()
Paul B Mahol [Mon, 15 Jul 2013 17:39:55 +0000 (17:39 +0000)]
mxfenc: use ffio_fill()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agora144enc: set supported channel layouts.
Alexis Ballier [Mon, 15 Jul 2013 13:46:51 +0000 (09:46 -0400)]
ra144enc: set supported channel layouts.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/scale: remove av_opt_free()
Paul B Mahol [Mon, 15 Jul 2013 10:57:55 +0000 (10:57 +0000)]
lavfi/scale: remove av_opt_free()

Generic code calls it already.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoavformat/matroskadec: Detect conflicting sample rate/default_duration
Michael Niedermayer [Mon, 15 Jul 2013 15:13:45 +0000 (17:13 +0200)]
avformat/matroskadec: Detect conflicting sample rate/default_duration

Fixes Ticket2508

Thanks-to: Moritz Bunkus
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavfilter/avf_concat: fix AVOption flags typo
Michael Niedermayer [Mon, 15 Jul 2013 02:30:09 +0000 (04:30 +0200)]
avfilter/avf_concat: fix AVOption flags typo

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 15 Jul 2013 12:08:06 +0000 (14:08 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  indeo: Reject impossible FRAMETYPE_NULL

Conflicts:
libavcodec/ivi_common.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'f9e5261cab067be7278f73d515bc9b601eb56202'
Michael Niedermayer [Mon, 15 Jul 2013 11:58:38 +0000 (13:58 +0200)]
Merge commit 'f9e5261cab067be7278f73d515bc9b601eb56202'

* commit 'f9e5261cab067be7278f73d515bc9b601eb56202':
  indeo: Do not reference mismatched tiles

Conflicts:
libavcodec/ivi_common.c

See: dab70c62d20081bcf879b7b6bc3ffabc2e331542
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '28dda8a691f1c723a4a9365ab85f9625f1330096'
Michael Niedermayer [Mon, 15 Jul 2013 11:24:58 +0000 (13:24 +0200)]
Merge commit '28dda8a691f1c723a4a9365ab85f9625f1330096'

* commit '28dda8a691f1c723a4a9365ab85f9625f1330096':
  indeo: Sanitize ff_ivi_init_planes fail paths

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'b0eeb9d442e4b7e82f6797d74245434ea33110a5'
Michael Niedermayer [Mon, 15 Jul 2013 11:18:07 +0000 (13:18 +0200)]
Merge commit 'b0eeb9d442e4b7e82f6797d74245434ea33110a5'

* commit 'b0eeb9d442e4b7e82f6797d74245434ea33110a5':
  indeo5: return proper error codes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '25a6666f6c07c6ac8449a63d7fbce0dfd29c54cd'
Michael Niedermayer [Mon, 15 Jul 2013 10:45:32 +0000 (12:45 +0200)]
Merge commit '25a6666f6c07c6ac8449a63d7fbce0dfd29c54cd'

* commit '25a6666f6c07c6ac8449a63d7fbce0dfd29c54cd':
  indeo: Bound-check before applying motion compensation

The added checks and one previously added check are replaced by asserts,
the conditions can only be
true when vectors are invalid or there are worse inconsistencies.
We are checking the vectors validity and there should be no
inconsistencies, thus the checks should not be needed.
Also no files are known to cause any anomalies in ffmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '1dd1b2332ebbac710d8e0214cec7595e118f2105'
Michael Niedermayer [Mon, 15 Jul 2013 10:32:18 +0000 (12:32 +0200)]
Merge commit '1dd1b2332ebbac710d8e0214cec7595e118f2105'

* commit '1dd1b2332ebbac710d8e0214cec7595e118f2105':
  rtsp: Include an User-Agent header field in all requests

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavc/avcodec.h: extend documentation for AVPicture API
Stefano Sabatini [Thu, 27 Jun 2013 11:02:02 +0000 (13:02 +0200)]
lavc/avcodec.h: extend documentation for AVPicture API

7 years agoindeo: Reject impossible FRAMETYPE_NULL
Luca Barbato [Sun, 14 Jul 2013 16:16:56 +0000 (18:16 +0200)]
indeo: Reject impossible FRAMETYPE_NULL

A frame marked FRAMETYPE_NULL cannot be scalable and requires a
previous frame successfully decoded.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agoindeo: Do not reference mismatched tiles
Luca Barbato [Sun, 14 Jul 2013 14:49:43 +0000 (16:49 +0200)]
indeo: Do not reference mismatched tiles

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agoindeo: Sanitize ff_ivi_init_planes fail paths
Luca Barbato [Sun, 14 Jul 2013 13:48:17 +0000 (15:48 +0200)]
indeo: Sanitize ff_ivi_init_planes fail paths

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agoindeo5: return proper error codes
Luca Barbato [Sun, 14 Jul 2013 12:41:56 +0000 (14:41 +0200)]
indeo5: return proper error codes

7 years agoindeo: Bound-check before applying motion compensation
Luca Barbato [Sun, 14 Jul 2013 12:06:16 +0000 (14:06 +0200)]
indeo: Bound-check before applying motion compensation

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agoMAINTAINERS: drop 1.1 from the releases that i maintain
Michael Niedermayer [Thu, 11 Jul 2013 10:35:39 +0000 (12:35 +0200)]
MAINTAINERS: drop 1.1 from the releases that i maintain

There seems to be no need to continue maintaining it, people can easily
upgrade to 1.2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/stereo3d: subsampled yuv support for non-anaglyph outputs
Paul B Mahol [Sun, 14 Jul 2013 20:12:32 +0000 (20:12 +0000)]
lavfi/stereo3d: subsampled yuv support for non-anaglyph outputs

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agooggparsevorbis: Support official chapter extension
James Almer [Sat, 13 Jul 2013 09:09:38 +0000 (06:09 -0300)]
oggparsevorbis: Support official chapter extension

Fixes ticket #1833

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: fix stereo3d
Michael Niedermayer [Sun, 14 Jul 2013 20:02:06 +0000 (22:02 +0200)]
fate: fix stereo3d

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/drawutils: set subsampling for rgb too
Paul B Mahol [Sun, 14 Jul 2013 17:59:25 +0000 (17:59 +0000)]
lavfi/drawutils: set subsampling for rgb too

Otherwise it is incorrectly set to 1.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agortsp: Include an User-Agent header field in all requests
Martin Storsjö [Fri, 12 Jul 2013 09:14:12 +0000 (12:14 +0300)]
rtsp: Include an User-Agent header field in all requests

Some rtsp servers like the IP Cam IcyBox IB-CAM2002 need it.

Based on a patch by Carl Eugen Hoyos.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agolavfi/mp: remove mp=perspective
Paul B Mahol [Sun, 14 Jul 2013 16:11:01 +0000 (16:11 +0000)]
lavfi/mp: remove mp=perspective

The filter was ported to a native libavfilter filter.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolavfi: port perspective filter from libmpcodecs
Paul B Mahol [Fri, 12 Jul 2013 17:50:22 +0000 (17:50 +0000)]
lavfi: port perspective filter from libmpcodecs

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agodoc/bitstream_filters: amend name of some bitstream filters
Stefano Sabatini [Sat, 13 Jul 2013 15:12:41 +0000 (17:12 +0200)]
doc/bitstream_filters: amend name of some bitstream filters

7 years agoindeo4: print an error message if ref_mb is needed but unavailable
Michael Niedermayer [Sun, 14 Jul 2013 13:18:03 +0000 (15:18 +0200)]
indeo4: print an error message if ref_mb is needed but unavailable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoindeo: print errors if transform and block size mismatch
Michael Niedermayer [Sun, 14 Jul 2013 12:20:42 +0000 (14:20 +0200)]
indeo: print errors if transform and block size mismatch

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 14 Jul 2013 11:37:40 +0000 (13:37 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  indeo: Bound-check before applying transform

Conflicts:
libavcodec/indeo4.c
libavcodec/indeo5.c
libavcodec/ivi_common.c

See: af388237093ed6df6f5118b34ef938a2ca2ffbda0846719dd11ab3f7a7caee13e7af71f71d913389
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'cd78e934c246d1b2510f8fba0abfe40bb75795f6'
Michael Niedermayer [Sun, 14 Jul 2013 10:48:13 +0000 (12:48 +0200)]
Merge commit 'cd78e934c246d1b2510f8fba0abfe40bb75795f6'

* commit 'cd78e934c246d1b2510f8fba0abfe40bb75795f6':
  indeo4: Validate scantable dimension

See: 92f7f1db421ee8b3431534fa09e8050ba622c33a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '6255ccf7d51c82ab79bf0cd47a921f572dda4489'
Michael Niedermayer [Sun, 14 Jul 2013 10:42:23 +0000 (12:42 +0200)]
Merge commit '6255ccf7d51c82ab79bf0cd47a921f572dda4489'

* commit '6255ccf7d51c82ab79bf0cd47a921f572dda4489':
  indeo4: Check the quantization matrix index

Conflicts:
libavcodec/indeo4.c

See: 8a20774a24bb1ea68b7360113746eac6e59ad8a8

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '8435bca087c0e79385763c51de009fd89390b6a5'
Michael Niedermayer [Sun, 14 Jul 2013 10:34:07 +0000 (12:34 +0200)]
Merge commit '8435bca087c0e79385763c51de009fd89390b6a5'

* commit '8435bca087c0e79385763c51de009fd89390b6a5':
  indeo4: Do not access missing reference MV

Conflicts:
libavcodec/indeo4.c

See: 5216245aaae44fb4

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '031be5b41b54c3b666f31d83fe3ad41c194af8c5'
Michael Niedermayer [Sun, 14 Jul 2013 10:10:38 +0000 (12:10 +0200)]
Merge commit '031be5b41b54c3b666f31d83fe3ad41c194af8c5'

* commit '031be5b41b54c3b666f31d83fe3ad41c194af8c5':
  ac3dec: Consistently use AC3_BLOCK_SIZE and sizeof

Conflicts:
libavcodec/ac3dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '68e57cde68f3da4c557ca15491fda74d1ea6321e'
Michael Niedermayer [Sun, 14 Jul 2013 10:05:08 +0000 (12:05 +0200)]
Merge commit '68e57cde68f3da4c557ca15491fda74d1ea6321e'

* commit '68e57cde68f3da4c557ca15491fda74d1ea6321e':
  ac3dec: Increment channel pointers only once per channel

Conflicts:
libavcodec/ac3dec.c

See: 7aabeea9ba0e557e834c886de5ea4db8e9a5193d

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '886e1b36f5044d3ceccbb01f64619acaf288fb7c'
Michael Niedermayer [Sun, 14 Jul 2013 09:41:57 +0000 (11:41 +0200)]
Merge commit '886e1b36f5044d3ceccbb01f64619acaf288fb7c'

* commit '886e1b36f5044d3ceccbb01f64619acaf288fb7c':
  jpeg2000: Remove unused passes array in Jpeg200Cblk structure

The array is left as its used by our encoder

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswscale: call handle_format() from the functions that need it
Michael Niedermayer [Sun, 14 Jul 2013 01:35:34 +0000 (03:35 +0200)]
swscale: call handle_format() from the functions that need it

This should fix some hypothetical issues with alloc/init_context() usage

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswscale: make handle_formats() safe to be called multiple times
Michael Niedermayer [Sun, 14 Jul 2013 01:33:48 +0000 (03:33 +0200)]
swscale: make handle_formats() safe to be called multiple times

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswscale: move format handling to its own function
Michael Niedermayer [Sun, 14 Jul 2013 01:22:10 +0000 (03:22 +0200)]
swscale: move format handling to its own function

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/aecho: fix invalid free
Paul B Mahol [Sat, 13 Jul 2013 23:45:05 +0000 (23:45 +0000)]
lavfi/aecho: fix invalid free

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolavfi/silencedetect: unbreak for unknown channel layouts
Paul B Mahol [Sat, 13 Jul 2013 22:22:12 +0000 (22:22 +0000)]
lavfi/silencedetect: unbreak for unknown channel layouts

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolavfi/ashowinfo: unbreak for >8 channels
Paul B Mahol [Sat, 13 Jul 2013 22:04:14 +0000 (22:04 +0000)]
lavfi/ashowinfo: unbreak for >8 channels

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolavfi/asetnsamples: unbreak for >8 channels
Paul B Mahol [Sat, 13 Jul 2013 21:59:13 +0000 (21:59 +0000)]
lavfi/asetnsamples: unbreak for >8 channels

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolavfi/trim: fix sample copy for >8 channels
Paul B Mahol [Sat, 13 Jul 2013 21:53:34 +0000 (21:53 +0000)]
lavfi/trim: fix sample copy for >8 channels

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolavfi/showwaves: fix floating exception with >8 channels
Paul B Mahol [Sat, 13 Jul 2013 21:46:27 +0000 (21:46 +0000)]
lavfi/showwaves: fix floating exception with >8 channels

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoavfilter/asrc_aevalsrc: fix cases of unknown channel layout
Michael Niedermayer [Sat, 13 Jul 2013 19:42:39 +0000 (21:42 +0200)]
avfilter/asrc_aevalsrc: fix cases of unknown channel layout

Fixes >8 channels

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavdevice/lavfi: fix input with unknown channel layout
Michael Niedermayer [Sat, 13 Jul 2013 19:41:18 +0000 (21:41 +0200)]
avdevice/lavfi: fix input with unknown channel layout

Fixes handling of >8 channels

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoindeo: Bound-check before applying transform
Luca Barbato [Fri, 12 Jul 2013 12:33:24 +0000 (14:33 +0200)]
indeo: Bound-check before applying transform

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agoindeo4: Validate scantable dimension
Luca Barbato [Fri, 12 Jul 2013 16:10:05 +0000 (18:10 +0200)]
indeo4: Validate scantable dimension

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agoindeo4: Check the quantization matrix index
Luca Barbato [Fri, 12 Jul 2013 13:02:33 +0000 (15:02 +0200)]
indeo4: Check the quantization matrix index

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agoindeo4: Do not access missing reference MV
Luca Barbato [Fri, 12 Jul 2013 12:32:03 +0000 (14:32 +0200)]
indeo4: Do not access missing reference MV

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agoac3dec: Consistently use AC3_BLOCK_SIZE and sizeof
Martin Storsjö [Thu, 11 Jul 2013 13:39:23 +0000 (16:39 +0300)]
ac3dec: Consistently use AC3_BLOCK_SIZE and sizeof

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoac3dec: Increment channel pointers only once per channel
Martin Storsjö [Thu, 11 Jul 2013 13:30:18 +0000 (16:30 +0300)]
ac3dec: Increment channel pointers only once per channel

If the channel mapping map multiple output channels to one
input channel, we should only increment the actual pointer once.

Cc: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agojpeg2000: Remove unused passes array in Jpeg200Cblk structure
Nicolas Bertrand [Sat, 13 Jul 2013 08:10:26 +0000 (10:10 +0200)]
jpeg2000: Remove unused passes array in Jpeg200Cblk structure

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agojpeg2000: Initialize only once mqc arrays
Nicolas Bertrand [Fri, 12 Jul 2013 21:15:43 +0000 (23:15 +0200)]
jpeg2000: Initialize only once mqc arrays

Improves decoding speed.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agofate: add tests for stereo3d filter
Paul B Mahol [Sun, 12 May 2013 23:21:07 +0000 (23:21 +0000)]
fate: add tests for stereo3d filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoav_frame_get_buffer: Do not fail when the channel layout is unknown
Michael Niedermayer [Sat, 13 Jul 2013 18:58:18 +0000 (20:58 +0200)]
av_frame_get_buffer: Do not fail when the channel layout is unknown

Fixes handling of cases with unknown layouts but known channel counts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoconfigure: Disable avresample if an old version of yasm is used.
Carl Eugen Hoyos [Sat, 13 Jul 2013 15:16:44 +0000 (17:16 +0200)]
configure: Disable avresample if an old version of yasm is used.

The avresample maintainers decided not to support old versions of yasm.
Supporting old yasm in FFmpeg was no big effort in the last months,
so keep it for the time being.

7 years agormdec: Forward error messages from rm_assemble_video_frame() to the caller.
Carl Eugen Hoyos [Sat, 13 Jul 2013 12:19:26 +0000 (14:19 +0200)]
rmdec: Forward error messages from rm_assemble_video_frame() to the caller.

Fixes the cause of a null pointer dereference on oom
described in ticket #2724.

7 years agog726: Do not try to decode more than one channel.
Carl Eugen Hoyos [Sat, 13 Jul 2013 12:17:28 +0000 (14:17 +0200)]
g726: Do not try to decode more than one channel.

Ask for a sample instead.

Reviewed-by: Derek Buitenhuis
7 years agoconfigure: Only build ffserver if SA_RESAMPLE is available.
Carl Eugen Hoyos [Sat, 13 Jul 2013 12:15:07 +0000 (14:15 +0200)]
configure: Only build ffserver if SA_RESAMPLE is available.

QNX does not define SA_RESAMPLE (because it is not implemented).
Fixes ticket #2780.

Reviewed-by: Nicolas George
7 years agolavfi/delogo: Document where parameter show=1 draws its rectangle
Jean Delvare [Sat, 13 Jul 2013 14:51:09 +0000 (16:51 +0200)]
lavfi/delogo: Document where parameter show=1 draws its rectangle

It is not completely obvious where delogo's parameter show=1 draws its
rectangle. Document it so that the user can more easily tune the
parameters.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/delogo: Fix sign extension issue
Jean Delvare [Sat, 13 Jul 2013 14:50:42 +0000 (16:50 +0200)]
lavfi/delogo: Fix sign extension issue

Coverity complains about a possible sign extension issue in
apply_delogo(). While it is extremely unlikely to happen, it is easy
to fix so let's just do that. Using unsigned variables even makes the
binary code smaller.

Fixes Coverity CID 1046439.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/012v: improve stride selection
Michael Niedermayer [Sat, 13 Jul 2013 14:18:06 +0000 (16:18 +0200)]
avcodec/012v: improve stride selection

Fixes decoding some files
Fixes Ticket2126

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffplay: remove explicit idct option
Michael Niedermayer [Sat, 13 Jul 2013 03:02:42 +0000 (05:02 +0200)]
ffplay: remove explicit idct option

this allows named idct options to be used

Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agojpeg2000: fix overflow in dequantization
Michael Niedermayer [Sat, 13 Jul 2013 00:24:56 +0000 (02:24 +0200)]
jpeg2000: fix overflow in dequantization

Fixes decoding of file generated with:
ffmpeg -f lavfi -i smptehdbars=hd720 -pix_fmt rgb48 /tmp/o.jp2

Reviewed-by: Nicolas BERTRAND <nicoinattendu@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 13 Jul 2013 10:22:17 +0000 (12:22 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  jpeg2000: Initialize only once mqc arrays

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agojpeg2000: Initialize only once mqc arrays
Nicolas Bertrand [Fri, 12 Jul 2013 21:01:43 +0000 (23:01 +0200)]
jpeg2000: Initialize only once mqc arrays

Increases encoding and decoding speed

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf: add missing build dependency for tta demuxer
Paul B Mahol [Fri, 12 Jul 2013 19:51:48 +0000 (19:51 +0000)]
lavf: add missing build dependency for tta demuxer

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoretry_transfer_wrapper(): check for interrupt before operation
Andrey Utkin [Wed, 10 Jul 2013 21:19:05 +0000 (00:19 +0300)]
retry_transfer_wrapper(): check for interrupt before operation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoff_network_wait_fd_timeout(): check for interrupt before operation
Andrey Utkin [Fri, 12 Jul 2013 07:35:51 +0000 (10:35 +0300)]
ff_network_wait_fd_timeout(): check for interrupt before operation

Reviewed-by: Lukasz M <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavfilter/trim: add compatibility layer to not break ABI used by ffmpeg
Michael Niedermayer [Fri, 12 Jul 2013 19:21:29 +0000 (21:21 +0200)]
avfilter/trim: add compatibility layer to not break ABI used by ffmpeg

This is a hotfix to fix -t / -ss
a different solution might be choosen later, i just dont want to leave
this broken

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoFix compilation with --disable-everything --enable-demuxer=aac.
Carl Eugen Hoyos [Fri, 12 Jul 2013 19:27:21 +0000 (21:27 +0200)]
Fix compilation with --disable-everything --enable-demuxer=aac.

7 years agolavfi/trim: use AV_OPT_TYPE_DURATION
Paul B Mahol [Wed, 10 Jul 2013 18:25:53 +0000 (18:25 +0000)]
lavfi/trim: use AV_OPT_TYPE_DURATION

Workarounds for rounding differences between platforms should not be
needed any more.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoavcodec/jpeglsdec: Implement the 4th (lossy) transform
Michael Niedermayer [Thu, 11 Jul 2013 17:37:29 +0000 (19:37 +0200)]
avcodec/jpeglsdec: Implement the 4th (lossy) transform

Fixes remainder of Ticket893

Std deviation from the intended image is 0.11, max sample error +-1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/aevalsrc: remove hard limit on number of channels
Paul B Mahol [Fri, 12 Jul 2013 01:23:02 +0000 (01:23 +0000)]
lavfi/aevalsrc: remove hard limit on number of channels

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 12 Jul 2013 12:58:41 +0000 (14:58 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vf_interlace: better handling of odd video size

Conflicts:
libavfilter/vf_interlace.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '52ea29867070243385220a223d7512ea7d4ae2d2'
Michael Niedermayer [Fri, 12 Jul 2013 12:49:55 +0000 (14:49 +0200)]
Merge commit '52ea29867070243385220a223d7512ea7d4ae2d2'

* commit '52ea29867070243385220a223d7512ea7d4ae2d2':
  fate: use current syntax for the scale filter

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '3802833bc1f79775a1547c5e427fed6e92b77e53'
Michael Niedermayer [Fri, 12 Jul 2013 12:42:00 +0000 (14:42 +0200)]
Merge commit '3802833bc1f79775a1547c5e427fed6e92b77e53'

* commit '3802833bc1f79775a1547c5e427fed6e92b77e53':
  dca: Respect the current limits in the downmixing capabilities

Conflicts:
libavcodec/dcadec.c

See: 8e77c3846e91b1af9df4084736257d9899156eef

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'f261e508459e28beca59868a878e1519a44bb678'
Michael Niedermayer [Fri, 12 Jul 2013 12:13:04 +0000 (14:13 +0200)]
Merge commit 'f261e508459e28beca59868a878e1519a44bb678'

* commit 'f261e508459e28beca59868a878e1519a44bb678':
  dca: Error out on missing DSYNC

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'c82da343e635663605bd81c59d872bee3182da73'
Michael Niedermayer [Fri, 12 Jul 2013 11:48:16 +0000 (13:48 +0200)]
Merge commit 'c82da343e635663605bd81c59d872bee3182da73'

* commit 'c82da343e635663605bd81c59d872bee3182da73':
  pcm: always use codec->id instead of codec_id

This is not merged as we consistently use codec_id, while libav against what
the comit message might hint at mixes both in the decoder.
Its fine to use either but it should be consistent.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'c0d973c41b4568d5bad1295879e35cfa611bdcf2'
Michael Niedermayer [Fri, 12 Jul 2013 11:40:12 +0000 (13:40 +0200)]
Merge commit 'c0d973c41b4568d5bad1295879e35cfa611bdcf2'

* commit 'c0d973c41b4568d5bad1295879e35cfa611bdcf2':
  vdpau: use the correct namespace for the union

Conflicts:
libavcodec/vdpau.h

See: 68dfe530e0fb03b4d21dfe37f8a572b95c68485e

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'e9d394f3fad7e8fd8fc80e3b33cb045bbaceb446'
Michael Niedermayer [Fri, 12 Jul 2013 11:25:28 +0000 (13:25 +0200)]
Merge commit 'e9d394f3fad7e8fd8fc80e3b33cb045bbaceb446'

* commit 'e9d394f3fad7e8fd8fc80e3b33cb045bbaceb446':
  mlpdec: Do not set invalid context in read_restart_header

Conflicts:
libavcodec/mlpdec.c

See: a9cd12ee2afb3f3aad783c396816b23d8513f472

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '2b379a925162b6783bd9a81dc03e647e8b65494c'
Michael Niedermayer [Fri, 12 Jul 2013 11:10:53 +0000 (13:10 +0200)]
Merge commit '2b379a925162b6783bd9a81dc03e647e8b65494c'

* commit '2b379a925162b6783bd9a81dc03e647e8b65494c':
  mlpdsp: x86: Respect cpuflags

Conflicts:
libavcodec/x86/mlpdsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '3abde1a3b49cf299f2aae4eaae6b6cb5270bdc22'
Michael Niedermayer [Fri, 12 Jul 2013 10:57:17 +0000 (12:57 +0200)]
Merge commit '3abde1a3b49cf299f2aae4eaae6b6cb5270bdc22'

* commit '3abde1a3b49cf299f2aae4eaae6b6cb5270bdc22':
  pcx: Do not overread source buffer in pcx_rle_decode

Conflicts:
libavcodec/pcx.c

See: 8cd1c0febe88b757e915e9af15559575c21ca728
Bytestream based system is left in place and not switched to buf+end, such switch would be
a step backward

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '170fb593c617cd797d00cf05bfb8d8c21d612893'
Michael Niedermayer [Fri, 12 Jul 2013 10:36:04 +0000 (12:36 +0200)]
Merge commit '170fb593c617cd797d00cf05bfb8d8c21d612893'

* commit '170fb593c617cd797d00cf05bfb8d8c21d612893':
  pcx: K&R formatting cosmetics

Conflicts:
libavcodec/pcx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'ef5b70affc6376bfeadd1ff649b79bad9a124fa8'
Michael Niedermayer [Fri, 12 Jul 2013 09:59:45 +0000 (11:59 +0200)]
Merge commit 'ef5b70affc6376bfeadd1ff649b79bad9a124fa8'

* commit 'ef5b70affc6376bfeadd1ff649b79bad9a124fa8':
  configure: Check for support for labels in the inline assembly

The timer code is not placed under ifdef as ours does not use labels

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