ffmpeg.git
7 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Sun, 21 Jul 2013 16:03:21 +0000 (18:03 +0200)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: fix build with disabled avfilter

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/ff_h264_decode_sei: use skip_bits_long()
Michael Niedermayer [Sun, 21 Jul 2013 14:39:18 +0000 (16:39 +0200)]
avcodec/ff_h264_decode_sei: use skip_bits_long()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/ff_h264_decode_sei: Check SEI size
Michael Niedermayer [Sun, 21 Jul 2013 14:38:47 +0000 (16:38 +0200)]
avcodec/ff_h264_decode_sei: Check SEI size

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/ff_h264_decode_sei: fix integer overflow with size.
Michael Niedermayer [Sun, 21 Jul 2013 14:34:14 +0000 (16:34 +0200)]
avcodec/ff_h264_decode_sei: fix integer overflow with size.

This issue is hypothetical and no testcase is available.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/h264_sei/ff_h264_decode_sei: fix error codes for insufficient data
Michael Niedermayer [Sun, 21 Jul 2013 14:15:24 +0000 (16:15 +0200)]
avcodec/h264_sei/ff_h264_decode_sei: fix error codes for insufficient data

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoRevert "avformat/utils: Close codec context since it is allocated by avformat_new_str...
Michael Niedermayer [Sun, 21 Jul 2013 15:51:25 +0000 (17:51 +0200)]
Revert "avformat/utils: Close codec context since it is allocated by avformat_new_stream in refrence to ticket 2716"

This causes a race condition with VLC. Its plausible that other
applications also would have races with it and its just fixing a memleak when
the user application forgets to free the codec. It causes more
problems than it solves in its current form, thus the revert.
Better solutions are welcome

This reverts commit 0f229f9b91fe3c4ebd97e88f004d638819b76add.

7 years agoh264: add frame packing as stereo_mode frame metadata
Joakim Plate [Thu, 27 Jun 2013 21:09:06 +0000 (23:09 +0200)]
h264: add frame packing as stereo_mode frame metadata

This matches the matroska defintion of stereo_mode, with
no metadata written if no info exist in sei

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/utils: Close codec context since it is allocated by avformat_new_stream...
Anshul Maheshwari [Thu, 27 Jun 2013 10:09:19 +0000 (15:39 +0530)]
avformat/utils: Close codec context since it is allocated by avformat_new_stream in refrence to ticket 2716

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 21 Jul 2013 10:07:35 +0000 (12:07 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dsicinav: Clip the source size to the expected maximum

Clipping the compressed size based on the uncompressed size is not correct
thus this commit is not merged, and the merge is for git metadata only

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffplay: fix build with disabled avfilter
Marton Balint [Sun, 21 Jul 2013 09:55:49 +0000 (11:55 +0200)]
ffplay: fix build with disabled avfilter

Got broken in b383498e.

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agoMerge commit 'dd0bfc3a6a310e3e3674ce7742672d689a9a0e93'
Michael Niedermayer [Sun, 21 Jul 2013 09:55:51 +0000 (11:55 +0200)]
Merge commit 'dd0bfc3a6a310e3e3674ce7742672d689a9a0e93'

* commit 'dd0bfc3a6a310e3e3674ce7742672d689a9a0e93':
  dsicinav: Bound-check the source buffer when needed

Conflicts:
libavcodec/dsicinav.c

See: 47f0beadba9003391d8bfef59b15aa21a5b2d293
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'fcae3ff124ee97c9265e3b93f3d41238b2aee9bd'
Michael Niedermayer [Sun, 21 Jul 2013 09:45:48 +0000 (11:45 +0200)]
Merge commit 'fcae3ff124ee97c9265e3b93f3d41238b2aee9bd'

* commit 'fcae3ff124ee97c9265e3b93f3d41238b2aee9bd':
  dsicinav: K&R formatting cosmetics

Conflicts:
libavcodec/dsicinav.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovfilter/vf_scale: avoid using "{}"
Michael Niedermayer [Sun, 21 Jul 2013 02:47:09 +0000 (04:47 +0200)]
vfilter/vf_scale: avoid using "{}"

Should fix compile issues with MSVC

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/snowenc: convert speed relevant asserts to av_assert2()
Michael Niedermayer [Sun, 21 Jul 2013 02:40:12 +0000 (04:40 +0200)]
avcodec/snowenc: convert speed relevant asserts to av_assert2()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/snowdec: remove assert.h include, its unused
Michael Niedermayer [Sun, 21 Jul 2013 02:36:32 +0000 (04:36 +0200)]
avcodec/snowdec: remove assert.h include, its unused

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

This applies changes similar to fc6de70c44be05eb0368ab519bfb790431d8dee5
to the >8bit codepath

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/filters: document vf_scales color range
Michael Niedermayer [Sat, 20 Jul 2013 21:24:13 +0000 (23:24 +0200)]
doc/filters: document vf_scales color range

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavfilter/vf_scale; fix indent
Michael Niedermayer [Sat, 20 Jul 2013 20:20:25 +0000 (22:20 +0200)]
avfilter/vf_scale; fix indent

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavfilter/vf_scale: add in/out color range option
Michael Niedermayer [Sat, 20 Jul 2013 20:12:42 +0000 (22:12 +0200)]
avfilter/vf_scale: add in/out color range option

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavfilter/vf_scale: Add in/out yuv color matrix option
Michael Niedermayer [Sat, 20 Jul 2013 20:11:50 +0000 (22:11 +0200)]
avfilter/vf_scale: Add in/out yuv color matrix option

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavu/log: print prefix after \r.
Nicolas George [Fri, 19 Jul 2013 13:32:25 +0000 (15:32 +0200)]
lavu/log: print prefix after \r.

Should fix trac ticket #2797 because of the progress line.

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 20 Jul 2013 08:48:15 +0000 (10:48 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavfi: filtfmts: use newer avfilter APIs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '36fb0d02a1faa11eaee51de01fb4061ad6092af9'
Michael Niedermayer [Sat, 20 Jul 2013 08:37:25 +0000 (10:37 +0200)]
Merge commit '36fb0d02a1faa11eaee51de01fb4061ad6092af9'

* commit '36fb0d02a1faa11eaee51de01fb4061ad6092af9':
  rtsp: Support multicast source filters (RFC 4570)
  rtpproto: Check the source IP if one single source has been specified
  rtpproto: Support IGMPv3 source specific multicast inclusion

Conflicts:
libavformat/rtpproto.c
libavformat/rtsp.c
libavformat/rtsp.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffplay: use start_time as next audio pts on flush when seeking is not supported
Marton Balint [Sat, 13 Jul 2013 11:55:43 +0000 (13:55 +0200)]
ffplay: use start_time as next audio pts on flush when seeking is not supported

Theoretically using start_time should also work if seeking is available and we
could determine that the next packet after a flush packet is the first packet
of a stream, but I could not think of an easy and clean way to do that, that is
why I sticked to the no seeking available condition for now.

Fixes ticket #2647.

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agoffplay: estimate audio frame pts from the previous frame pts values
Marton Balint [Sat, 13 Jul 2013 00:50:24 +0000 (02:50 +0200)]
ffplay: estimate audio frame pts from the previous frame pts values

Previously we estimated the audio packet pts instead of the frame pts,
therefore it only worked within a single packet (containing multiple frames).

The new method works accross seperate audio packets as well and also handles
better the case if a decoder buffers several packets before outputting a
decoded frame.

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agoffplay: simplify audio decoding
Marton Balint [Tue, 2 Jul 2013 23:58:15 +0000 (01:58 +0200)]
ffplay: simplify audio decoding

Also use negative stream_index for signaling obsolete audio packets. Using the
size alone is not enough, because size is 0 for null packets as well.

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agoavfilter/vf_separatefields: fix ;;
Michael Niedermayer [Fri, 19 Jul 2013 22:44:09 +0000 (00:44 +0200)]
avfilter/vf_separatefields: fix ;;

Found-by: llogan
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/matroskaenc: Only change chapter ids if needed.
Michael Niedermayer [Fri, 19 Jul 2013 20:52:16 +0000 (22:52 +0200)]
avformat/matroskaenc: Only change chapter ids if needed.

This also fixes the case where negative chapter ids where input
And fixes the case where remuxing from mkv changed chapter ids

Found-by: Luca Barbato
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodsicinav: Clip the source size to the expected maximum
Luca Barbato [Fri, 19 Jul 2013 19:34:21 +0000 (21:34 +0200)]
dsicinav: Clip the source size to the expected maximum

A packet larger than cin->bitmap_size does not make sense.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agodsicinav: Bound-check the source buffer when needed
Luca Barbato [Fri, 19 Jul 2013 19:09:40 +0000 (21:09 +0200)]
dsicinav: Bound-check the source buffer when needed

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agodsicinav: K&R formatting cosmetics
Luca Barbato [Fri, 19 Jul 2013 19:05:44 +0000 (21:05 +0200)]
dsicinav: K&R formatting cosmetics

7 years agoavfilter: fix preprocessor condition
wm4 [Fri, 19 Jul 2013 17:05:41 +0000 (19:05 +0200)]
avfilter: fix preprocessor condition

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/filters: add sepia example for colorchannelmixer
Lukasz Marek [Wed, 17 Jul 2013 23:34:43 +0000 (01:34 +0200)]
doc/filters: add sepia example for colorchannelmixer

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoavutil/softfloat: remove unneeded include assert.h
Michael Niedermayer [Fri, 19 Jul 2013 16:56:33 +0000 (18:56 +0200)]
avutil/softfloat: remove unneeded include assert.h

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agotests/tiny_psnr: remove unneeded include assert.h
Michael Niedermayer [Fri, 19 Jul 2013 16:55:28 +0000 (18:55 +0200)]
tests/tiny_psnr: remove unneeded include assert.h

This is the only such occurance on tests/

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavfilter/vf_yadif:remove unneeded include assert.h
Michael Niedermayer [Fri, 19 Jul 2013 16:53:37 +0000 (18:53 +0200)]
avfilter/vf_yadif:remove unneeded include assert.h

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswscale: remove unneeded include assert.h
Michael Niedermayer [Fri, 19 Jul 2013 16:52:41 +0000 (18:52 +0200)]
swscale: remove unneeded include assert.h

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agojpeg2000dec: silence unused variable warning
Michael Niedermayer [Fri, 19 Jul 2013 15:54:57 +0000 (17:54 +0200)]
jpeg2000dec: silence unused variable warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agobmp: fix decoding of flipped rle4
Piotr Bandurski [Thu, 18 Jul 2013 07:36:05 +0000 (09:36 +0200)]
bmp: fix decoding of flipped rle4

Fixes ticket #2794

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswscale/input: fix 16bit gbrp input
Michael Niedermayer [Fri, 19 Jul 2013 02:19:23 +0000 (04:19 +0200)]
swscale/input: fix 16bit gbrp input

Fixes Ticket2793

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoexamples: demuxing: print ffplay command even if sample format is planar
wm4 [Thu, 18 Jul 2013 13:45:37 +0000 (15:45 +0200)]
examples: demuxing: print ffplay command even if sample format is planar

Adjust the code so that a working ffplay command is printed in the
planar audio case.

7 years agoexamples: demuxing: simplify audio output
wm4 [Thu, 18 Jul 2013 13:45:36 +0000 (15:45 +0200)]
examples: demuxing: simplify audio output

There is no reason why this should copy the audio data in a very
complicated way. Also, strictly write the first plane, instead of
writing the whole buffer. This is more helpful in context of the
example. This way a user can clearly confirm that it works by playing
the written data as raw audio.

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 agolavfi: filtfmts: use newer avfilter APIs
Vittorio Giovara [Tue, 16 Jul 2013 13:05:01 +0000 (15:05 +0200)]
lavfi: filtfmts: use newer avfilter APIs

Signed-off-by: Martin Storsjö <martin@martin.st>
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 agortsp: Support multicast source filters (RFC 4570)
Ed Torbett [Thu, 27 Jun 2013 07:53:00 +0000 (08:53 +0100)]
rtsp: Support multicast source filters (RFC 4570)

This supports inclusion of one single IP address for now,
at the media level. Specifying the filter at the session level
(instead of at the media level), multiple source addresses,
exclusion, or using FQDNs instead of plain IP addresses is not
supported (yet at least).

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agortpproto: Check the source IP if one single source has been specified
Martin Storsjö [Thu, 18 Jul 2013 18:12:14 +0000 (21:12 +0300)]
rtpproto: Check the source IP if one single source has been specified

If another peer is sending unicast packets to the same port that
we are listening on, those packets can end up being received despite
using source specific multicast. For those cases, manually check the
source address of received packets against the intended source address.

This only handles the case when the source list is one single IP
address for now, which probably is the most common case.

Based on a patch by Ed Torbett.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agortpproto: Support IGMPv3 source specific multicast inclusion
Ed Torbett [Thu, 18 Jul 2013 17:04:16 +0000 (20:04 +0300)]
rtpproto: Support IGMPv3 source specific multicast inclusion

Blocking/exclusion is not supported yet.

The rtp protocol parameter takes the same form as the existing
sources parameter for the udp protocol.

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