ffmpeg.git
7 years agoexamples: demuxing: do partial audio packet decoding
wm4 [Thu, 18 Jul 2013 13:45:35 +0000 (15:45 +0200)]
examples: demuxing: do partial audio packet decoding

This assumes one audio packet is decoded one time. This is not true:
packets can be partially decoded. Then you have to "adjust" the packet
and pass the undecoded part of the packet to the decode function again.

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 19 Jul 2013 09:08:38 +0000 (11:08 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  compat: Add missing license boilerplates

Conflicts:
compat/tms470/math.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '439902e0d68a0f0d800c21b5e6b598d5fa0c51da'
Michael Niedermayer [Fri, 19 Jul 2013 08:56:10 +0000 (10:56 +0200)]
Merge commit '439902e0d68a0f0d800c21b5e6b598d5fa0c51da'

* commit '439902e0d68a0f0d800c21b5e6b598d5fa0c51da':
  Employ consistent LIBAV_COMPAT_ multiple inclusion guards in compat/

Conflicts:
compat/aix/math.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'd010e95f86089abe9a3d4d4a66ac8102312d28a4'
Michael Niedermayer [Fri, 19 Jul 2013 08:25:26 +0000 (10:25 +0200)]
Merge commit 'd010e95f86089abe9a3d4d4a66ac8102312d28a4'

* commit 'd010e95f86089abe9a3d4d4a66ac8102312d28a4':
  avserver: Remove unused loadable module support

Conflicts:
configure
ffserver.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoimg2enc: add option to use strftime() for filename
Ramiro Polla [Thu, 18 Jul 2013 22:17:11 +0000 (19:17 -0300)]
img2enc: add option to use strftime() for filename

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agojpeg2000dec: Support non subsampled 8bit planar pixel formats
Michael Niedermayer [Sun, 7 Jul 2013 22:58:40 +0000 (00:58 +0200)]
jpeg2000dec: Support non subsampled 8bit planar pixel formats

Fixes file2.jp2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agojpeg2000dec: parse CDEF
Michael Niedermayer [Sun, 7 Jul 2013 22:57:32 +0000 (00:57 +0200)]
jpeg2000dec: parse CDEF

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

libavcodec/jpeg2000dec.c

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agocompat: Add missing license boilerplates
Diego Biurrun [Thu, 18 Jul 2013 13:13:18 +0000 (15:13 +0200)]
compat: Add missing license boilerplates

7 years agoEmploy consistent LIBAV_COMPAT_ multiple inclusion guards in compat/
Diego Biurrun [Thu, 25 Oct 2012 14:49:26 +0000 (16:49 +0200)]
Employ consistent LIBAV_COMPAT_ multiple inclusion guards in compat/

Also fix a comment and an #endif comment.

7 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Thu, 18 Jul 2013 16:10:41 +0000 (18:10 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Fix pix_fmt detection in the native jpeg2000 decoder.
  lavf/concat: Never fail for sample aspect ratio 0:1.
  lut3d: Fix reading 3dl files with leading comments.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/rt*p: Joining a SSM multicast group using an SDP (Issue #2171)
Ed Torbett [Thu, 27 Jun 2013 07:53:00 +0000 (08:53 +0100)]
avformat/rt*p: Joining a SSM multicast group using an SDP (Issue #2171)

Passes Source-Specific Multicast parameters read from an sdp file through to the UDP socket code,
allowing source-specific multicast streams to be correctly received. As an integral part of this
change, additional checking (currently only enabled in the case of SSM streams, but probably
useful in similar scenarios) has been added to the RTP protocol handler to distinguish UDP packets
arriving from multiple sources to the same port and process only the expected packets
(those transmitted from the expected UDP source address). This resolves an issue identified
when multiple instances of FFmpeg subscribe to different Source-Specific Multicast streams
but with each sharing the same destination port.

Signed-off-by: Edward Torbett <ed.torbett@simulation-systems.co.uk>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavserver: Remove unused loadable module support
Martin Storsjö [Wed, 17 Jul 2013 15:24:23 +0000 (18:24 +0300)]
avserver: Remove unused loadable module support

There is no record of this ever being used at all, anywhere,
since the feature was added in 2effd274466.

This gets rid of extra linker tricks just to support a feature
that isn't used, simplifying portability to other platforms.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoFix pix_fmt detection in the native jpeg2000 decoder.
Carl Eugen Hoyos [Thu, 18 Jul 2013 08:56:15 +0000 (10:56 +0200)]
Fix pix_fmt detection in the native jpeg2000 decoder.

Based on b7a928b by Michael Bradshaw.
Fixes ticket #2683.

Reviewed-by: Nicolas Bertrand
7 years agolavf/concat: Never fail for sample aspect ratio 0:1.
Carl Eugen Hoyos [Thu, 18 Jul 2013 08:55:52 +0000 (10:55 +0200)]
lavf/concat: Never fail for sample aspect ratio 0:1.

Fixes ticket #2456.

Reviewed-by: Nicolas George
7 years agolut3d: Fix reading 3dl files with leading comments.
Carl Eugen Hoyos [Thu, 18 Jul 2013 08:55:30 +0000 (10:55 +0200)]
lut3d: Fix reading 3dl files with leading comments.

Fixes ticket #2787.

7 years agolavfi/scale: allocate interlaced scalers only if needed.
Nicolas George [Thu, 18 Jul 2013 09:03:56 +0000 (11:03 +0200)]
lavfi/scale: allocate interlaced scalers only if needed.

Fix "Value 0.000000 for parameter 'srch' out of range"
error message when source or destination height is 1.

Note: since the av_opt_set_int() calls are not checked for
failure and the interlaced scalers are not actually used,
this error has no consequence apart from a frightening message
in the log.

7 years agovorbiscomment: Add DESCRIPTION to ff_vorbiscomment_metadata_conv
James Almer [Thu, 18 Jul 2013 08:08:07 +0000 (05:08 -0300)]
vorbiscomment: Add DESCRIPTION to ff_vorbiscomment_metadata_conv

It's the official (or recommended) name for comment/description entries.
See https://www.xiph.org/vorbis/doc/v-comment.html

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf/riff: Add ITRK tag
James Almer [Thu, 18 Jul 2013 08:44:40 +0000 (05:44 -0300)]
lavf/riff: Add ITRK tag

Some players, like foobar2000 or modern versions of WMP, create WAV
files using the ITRK tag for track instead of IPRT

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 18 Jul 2013 07:53:47 +0000 (09:53 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Consistently use "cpu_flags" as variable/parameter name for CPU flags

Conflicts:
libavcodec/x86/dsputil_init.c
libavcodec/x86/h264dsp_init.c
libavcodec/x86/hpeldsp_init.c
libavcodec/x86/motion_est.c
libavcodec/x86/mpegvideo.c
libavcodec/x86/proresdsp_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge https://github.com/lukaszmluki/ffmpeg
Michael Niedermayer [Wed, 17 Jul 2013 23:40:37 +0000 (01:40 +0200)]
Merge https://github.com/lukaszmluki/ffmpeg

* https://github.com/lukaszmluki/ffmpeg:
  ftp: warning about pure-ftp server used as and output
  ftp: comments
  ftp: remove unused headers
  ftp: fix interrupt callback misuse

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovf_scale: use sws_init_context()
Michael Niedermayer [Sun, 14 Jul 2013 03:19:46 +0000 (05:19 +0200)]
vf_scale: use sws_init_context()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf/matroskaenc: using valid chapter ids
Fabian Neundorf [Wed, 17 Jul 2013 10:47:24 +0000 (12:47 +0200)]
lavf/matroskaenc: using valid chapter ids

Fixes ticket 2790, by starting the ChapterUIDs in mkv files with 1 instead of a 0.
 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoConsistently use "cpu_flags" as variable/parameter name for CPU flags
Diego Biurrun [Wed, 17 Jul 2013 18:19:24 +0000 (20:19 +0200)]
Consistently use "cpu_flags" as variable/parameter name for CPU flags

7 years agoswscale/options: fix copy and paste typo
Michael Niedermayer [Wed, 17 Jul 2013 14:53:22 +0000 (16:53 +0200)]
swscale/options: fix copy and paste typo

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoftp: warning about pure-ftp server used as and output
Lukasz Marek [Wed, 17 Jul 2013 00:37:15 +0000 (02:37 +0200)]
ftp: warning about pure-ftp server used as and output

7 years agoftp: comments
Lukasz Marek [Wed, 17 Jul 2013 00:15:20 +0000 (02:15 +0200)]
ftp: comments

7 years agoftp: remove unused headers
Lukasz Marek [Tue, 16 Jul 2013 23:42:23 +0000 (01:42 +0200)]
ftp: remove unused headers

7 years agoftp: fix interrupt callback misuse
Lukasz Marek [Tue, 16 Jul 2013 21:48:16 +0000 (23:48 +0200)]
ftp: fix interrupt callback misuse

FTP protocol used interrupt callback to simulate nonblock
operation which is a misuse of this callback.

This commit make FTP protocol fully blocking and removes
invalid usage of interrutp callback

Also adds support for multiline responses delimited with dashes

7 years agoFixing a stride issue in VP8 Alpha encode
Vignesh Venkatasubramanian [Tue, 16 Jul 2013 20:44:56 +0000 (13:44 -0700)]
Fixing a stride issue in VP8 Alpha encode

When encoding alpha channel in libvpx, the stride isn't set
properly for the alpha encoder. Fixing it.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomatroskaenc: simplify mkv_check_tag()
Michael Niedermayer [Wed, 17 Jul 2013 11:30:36 +0000 (13:30 +0200)]
matroskaenc: simplify mkv_check_tag()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf/matroskaenc: Check for valid metadata before creating tags
James Almer [Wed, 17 Jul 2013 06:10:16 +0000 (03:10 -0300)]
lavf/matroskaenc: Check for valid metadata before creating tags

Tags must have at least one SimpleTag element to be spec conformant.
Updated lavf-mkv and seek-lavf-mkv FATE references as the tests were affected by
this.

Fixes ticket #2785

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 17 Jul 2013 08:42:11 +0000 (10:42 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fmtconvert: Explicitly use int32_t instead of int

Conflicts:
libavcodec/ac3dec.c
libavcodec/fmtconvert.c
libavcodec/fmtconvert.h

See: f49564c6075935443323abf4571a62205e7b3c59
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '50612484e058e8b241f0528584d64d9d2ccebf12'
Michael Niedermayer [Wed, 17 Jul 2013 08:33:02 +0000 (10:33 +0200)]
Merge commit '50612484e058e8b241f0528584d64d9d2ccebf12'

* commit '50612484e058e8b241f0528584d64d9d2ccebf12':
  pthread: Rename thread_init to avoid symbol collision

Conflicts:
libavcodec/pthread.c
libavfilter/pthread.c

See: 674d8a9629609a17fd6916164556cb012d6e6a1c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofmtconvert: Explicitly use int32_t instead of int
Christophe Gisquet [Thu, 27 Dec 2012 21:33:51 +0000 (22:33 +0100)]
fmtconvert: Explicitly use int32_t instead of int

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agodoc/filters: update/correct mp documentation
Stefano Sabatini [Wed, 17 Jul 2013 07:34:05 +0000 (09:34 +0200)]
doc/filters: update/correct mp documentation

7 years agodoc/bitstream_filters: document dump_extra
Stefano Sabatini [Tue, 16 Jul 2013 13:34:02 +0000 (15:34 +0200)]
doc/bitstream_filters: document dump_extra

7 years agoswscale: Add support to specify chroma position
Michael Niedermayer [Sun, 14 Jul 2013 03:19:44 +0000 (05:19 +0200)]
swscale: Add support to specify chroma position

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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 agopthread: Rename thread_init to avoid symbol collision
Sean McGovern [Tue, 16 Jul 2013 15:31:23 +0000 (11:31 -0400)]
pthread: Rename thread_init to avoid symbol collision

The AIX threads library exposes a function with the same name.

Signed-off-by: Martin Storsjö <martin@martin.st>
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