ffmpeg.git
7 years agoavcodec/mpegaudio_tablegen: remove dead branch
Michael Niedermayer [Tue, 15 Oct 2013 19:43:32 +0000 (21:43 +0200)]
avcodec/mpegaudio_tablegen: remove dead branch

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat: rename a few more h.265 to HEVC
Michael Niedermayer [Tue, 15 Oct 2013 19:18:48 +0000 (21:18 +0200)]
avformat: rename a few more h.265 to HEVC

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec: improve precission for cbrtf() emulation
Michael Niedermayer [Tue, 15 Oct 2013 18:06:44 +0000 (20:06 +0200)]
avcodec: improve precission for cbrtf() emulation

cbrtf() took floats but it represented 1/3 exactly
and even if not more precission should be better in theory
for the table generation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompegaudio_tablegen: Don't use llrint
Derek Buitenhuis [Tue, 15 Jan 2013 21:28:05 +0000 (16:28 -0500)]
mpegaudio_tablegen: Don't use llrint

You cannot count on it being present on all systems, and you
cannot include libm.h in a host tool, so just hard code a baseline
implementation.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
7 years agocos_tablegen: Don't use lrint
Derek Buitenhuis [Tue, 15 Jan 2013 21:28:04 +0000 (16:28 -0500)]
cos_tablegen: Don't use lrint

You cannot count on it being present on all systems, and you
cannot include libm.h in a host tool, so just hard code a baseline
implementation.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
7 years agotablegen: Don't use cbrtf in host tools
Derek Buitenhuis [Tue, 15 Jan 2013 21:28:03 +0000 (16:28 -0500)]
tablegen: Don't use cbrtf in host tools

You cannot count on them being present on all systems, and you
cannot include libm.h in a host tool, so just hard code baseline
implementations.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
7 years agotableprint: Fix use of a size_t print with MSVC
Derek Buitenhuis [Tue, 15 Jan 2013 21:28:02 +0000 (16:28 -0500)]
tableprint: Fix use of a size_t print with MSVC

%zu was introduced in C99, so MSVC has its own way to handle it,
namely %Iu.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
7 years agoconfigure: Warn when inline asm is disabled for ICL
Michael Niedermayer [Tue, 15 Oct 2013 13:52:27 +0000 (15:52 +0200)]
configure: Warn when inline asm is disabled for ICL

See Ticket3048

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf/segment: simplify logic and fix !=0 check on segment_end return value
Stefano Sabatini [Tue, 15 Oct 2013 13:17:22 +0000 (15:17 +0200)]
lavf/segment: simplify logic and fix !=0 check on segment_end return value

A successfull return value can be > 0.

7 years agolavf/segment: log segments as they end to AV_LOG_VERBOSE
Billy Shambrook [Tue, 15 Oct 2013 10:53:40 +0000 (11:53 +0100)]
lavf/segment: log segments as they end to AV_LOG_VERBOSE

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
7 years agolavf/segment: simplify segment_count update
Stefano Sabatini [Tue, 15 Oct 2013 12:54:25 +0000 (14:54 +0200)]
lavf/segment: simplify segment_count update

Now segment_count mark the segment_count of the current segment.

7 years agofate: add pxr24 exr test
Paul B Mahol [Sun, 13 Oct 2013 20:37:07 +0000 (20:37 +0000)]
fate: add pxr24 exr test

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoavcodec/jpeg2000dec: fix context consistency with too large lowres
Michael Niedermayer [Tue, 15 Oct 2013 11:15:47 +0000 (13:15 +0200)]
avcodec/jpeg2000dec: fix context consistency with too large lowres

Fixes out of array accesses
Fixes Ticket2898

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 15 Oct 2013 07:34:27 +0000 (09:34 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  http: Check the auth string contents and not only the pointer

Conflicts:
libavformat/http.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/x86/dsputil_init: move ff_idct_xvid_mmxext init
Michael Niedermayer [Tue, 15 Oct 2013 00:05:11 +0000 (02:05 +0200)]
avcodec/x86/dsputil_init: move ff_idct_xvid_mmxext init

This decreases the diff to libav

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/x86/dsputil_init: remove duplicated sse2 idct init
Michael Niedermayer [Mon, 14 Oct 2013 23:59:36 +0000 (01:59 +0200)]
avcodec/x86/dsputil_init: remove duplicated sse2 idct init

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/x86/dsputil_init: fix cpu flag checks
Michael Niedermayer [Mon, 14 Oct 2013 23:35:47 +0000 (01:35 +0200)]
avcodec/x86/dsputil_init: fix cpu flag checks

Fixes linking failure with --disable-sse2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc: make x11grab examples consistent with option names
Lou Logan [Sun, 13 Oct 2013 00:40:22 +0000 (16:40 -0800)]
doc: make x11grab examples consistent with option names

Change -r to -framerate, but either will work.
Change -s to -video_size, but either will work.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
7 years agomatroskadec: Demux support for SeekPreRoll and CodecDelay
Vignesh Venkatasubramanian [Mon, 14 Oct 2013 17:42:08 +0000 (10:42 -0700)]
matroskadec: Demux support for SeekPreRoll and CodecDelay

Adds support for demuxing SeekPreRoll and CodecDelay container
elements.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agohttp: Check the auth string contents and not only the pointer
Michael Niedermayer [Sun, 13 Oct 2013 22:56:32 +0000 (00:56 +0200)]
http: Check the auth string contents and not only the pointer

This makes sure we don't send the Except: 100-continue header
if no authentication credentials have been provided.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoavformat/rpl: use avpriv_report_missing_feature/avpriv_request_sample
Paul B Mahol [Mon, 14 Oct 2013 18:18:25 +0000 (18:18 +0000)]
avformat/rpl: use avpriv_report_missing_feature/avpriv_request_sample

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolavc: Adding seek_preroll to AVCodecContext
Vignesh Venkatasubramanian [Mon, 14 Oct 2013 14:41:16 +0000 (07:41 -0700)]
lavc: Adding seek_preroll to AVCodecContext

seek_preroll field is added to the AVCodecContext struct. It indicates
the number of samples to be discarded whenever there is a discontinuity.
The minor version is bumped accordingly.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoSupport H.264 fourcc UMSV.
Carl Eugen Hoyos [Mon, 14 Oct 2013 14:29:58 +0000 (16:29 +0200)]
Support H.264 fourcc UMSV.

Fixes ticket #3046.

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 14 Oct 2013 14:13:53 +0000 (16:13 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: more AVX2 framework

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'c6908d6b4b377a04a5d055ba874bdbcf06c80497'
Michael Niedermayer [Mon, 14 Oct 2013 14:06:17 +0000 (16:06 +0200)]
Merge commit 'c6908d6b4b377a04a5d055ba874bdbcf06c80497'

* commit 'c6908d6b4b377a04a5d055ba874bdbcf06c80497':
  x86inc: FMA3/4 Support

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '206895708ea2b464755d340e44501daf9a07c310'
Michael Niedermayer [Mon, 14 Oct 2013 13:53:46 +0000 (15:53 +0200)]
Merge commit '206895708ea2b464755d340e44501daf9a07c310'

* commit '206895708ea2b464755d340e44501daf9a07c310':
  x86inc: Remove our FMA4 support

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'c108ba0175d4fc3a3253a8b0f782fbfb96ba5098'
Michael Niedermayer [Mon, 14 Oct 2013 13:48:30 +0000 (15:48 +0200)]
Merge commit 'c108ba0175d4fc3a3253a8b0f782fbfb96ba5098'

* commit 'c108ba0175d4fc3a3253a8b0f782fbfb96ba5098':
  x86inc: Use VEX-encoded instructions in AVX functions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '15748773bf33c110e6e2e9526c7ba5478274c74c'
Michael Niedermayer [Mon, 14 Oct 2013 13:36:57 +0000 (15:36 +0200)]
Merge commit '15748773bf33c110e6e2e9526c7ba5478274c74c'

* commit '15748773bf33c110e6e2e9526c7ba5478274c74c':
  avresample/x86: Switch operand order for mulps

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '84a125c4c28f3e3e215d2e6c32f7f0ec43bbc04c'
Michael Niedermayer [Mon, 14 Oct 2013 13:31:05 +0000 (15:31 +0200)]
Merge commit '84a125c4c28f3e3e215d2e6c32f7f0ec43bbc04c'

* commit '84a125c4c28f3e3e215d2e6c32f7f0ec43bbc04c':
  rtmp: Allocate the prev_pkt arrays dynamically

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agox86: more AVX2 framework
Jason Garrett-Glaser [Wed, 27 Feb 2013 00:26:34 +0000 (16:26 -0800)]
x86: more AVX2 framework

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
7 years agox86inc: FMA3/4 Support
Jason Garrett-Glaser [Mon, 12 Nov 2012 18:28:53 +0000 (10:28 -0800)]
x86inc: FMA3/4 Support

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
7 years agox86inc: Remove our FMA4 support
Derek Buitenhuis [Wed, 9 Oct 2013 12:54:59 +0000 (08:54 -0400)]
x86inc: Remove our FMA4 support

This is so we can sync to x264's version of FMA4 support.

This partialy reverts commit 79687079a97a039c325ab79d7a95920d800b791f.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
7 years agox86inc: Use VEX-encoded instructions in AVX functions
Henrik Gramner [Tue, 11 Dec 2012 15:05:34 +0000 (16:05 +0100)]
x86inc: Use VEX-encoded instructions in AVX functions

Automatically use VEX-encoding in AVX/AVX2/XOP/FMA3/FMA4
functions for all instructions that exists in a VEX-encoded
version.

This change makes it easier to extend existing code to use AVX2.

Also add support for AVX emulation of a few instructions that
were missing before.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
7 years agoavresample/x86: Switch operand order for mulps
Derek Buitenhuis [Wed, 9 Oct 2013 12:41:36 +0000 (08:41 -0400)]
avresample/x86: Switch operand order for mulps

With the forthcoming VEX instruction emulation, mulps
must have only the third operand point to memory, as
this is what vmulps expects.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
7 years agortmp: Allocate the prev_pkt arrays dynamically
Martin Storsjö [Fri, 11 Oct 2013 19:16:04 +0000 (22:16 +0300)]
rtmp: Allocate the prev_pkt arrays dynamically

Normally, all channel ids are between 0 and 10, while they in
uncommon cases can have values up to 64k.

This avoids allocating two arrays for up to 64k entries (at a total
of over 6 MB in size) each when most of them aren't used at all.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agomovenc: use ff_alloc_extradata()
James Almer [Sun, 13 Oct 2013 23:02:28 +0000 (20:02 -0300)]
movenc: use ff_alloc_extradata()

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agooggparsecelt: use ff_alloc_extradata()
James Almer [Mon, 14 Oct 2013 08:15:26 +0000 (05:15 -0300)]
oggparsecelt: use ff_alloc_extradata()

Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agooggparseopus: use ff_alloc_extradata()
James Almer [Sun, 13 Oct 2013 23:02:26 +0000 (20:02 -0300)]
oggparseopus: use ff_alloc_extradata()

Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 14 Oct 2013 08:17:47 +0000 (10:17 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  cavs: Check for negative cbp

Conflicts:
libavcodec/cavsdec.c

See: 9f06c1c61e876e930753da200bfe835817e30a53
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '1b20d0f581f01f2df601c9e68d0d321672d97af7'
Michael Niedermayer [Mon, 14 Oct 2013 00:10:43 +0000 (02:10 +0200)]
Merge commit '1b20d0f581f01f2df601c9e68d0d321672d97af7'

* commit '1b20d0f581f01f2df601c9e68d0d321672d97af7':
  cavs: Return meaningful error values

Conflicts:
libavcodec/cavsdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '14ddbb477faef359983151b763fd8b20e578651b'
Michael Niedermayer [Mon, 14 Oct 2013 00:04:38 +0000 (02:04 +0200)]
Merge commit '14ddbb477faef359983151b763fd8b20e578651b'

* commit '14ddbb477faef359983151b763fd8b20e578651b':
  cavs: K&R formatting cosmetics

Conflicts:
libavcodec/cavs.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/http: check the auth string contents not the pointer which cannot be NULL
Michael Niedermayer [Sun, 13 Oct 2013 22:56:32 +0000 (00:56 +0200)]
avformat/http: check the auth string contents not the pointer which cannot be NULL

It appears this bug originates from a "work in progress" patch from
ffmpeg-devel that was heavily redesigned by and integrated in libav

And that patch even had a reply and review on the mailing list pointing
out that it had a bug.

This fixes a deadlock with ffserver

See: [FFmpeg-devel] [PATCH] Fix HTTP authentication problem for POST actions.
     [FFmpeg-devel] [PATCH 1/3] Introduce auth_phase flag, which will be true if authorization needs to be sent, but the type of authorization is not known yet Partial fix #3036
     [FFmpeg-devel] [PATCH 2/3] Only add Transfer-Encoding header when not in authorization phase, because server will wait (indefinitely) for data when receiving this header Partial fix #3036
     [FFmpeg-devel] [PATCH 3/3] Only allow posting data and/or forcing a 200 code, enabling posting isml chunks, -after- we did a possible first request to get a 403 from the server telling us which type of authentication to apply Final part fix #3036
See: 71549a857b13edf4c4f95037de6ed5bb4c4bd4af
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '71549a857b13edf4c4f95037de6ed5bb4c4bd4af'
Michael Niedermayer [Sun, 13 Oct 2013 22:37:01 +0000 (00:37 +0200)]
Merge commit '71549a857b13edf4c4f95037de6ed5bb4c4bd4af'

* commit '71549a857b13edf4c4f95037de6ed5bb4c4bd4af':
  http: Support auth method detection for POST

Conflicts:
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'eb8b05a3824a9fa85e20d603595ac8a3b83505d4'
Michael Niedermayer [Sun, 13 Oct 2013 22:17:49 +0000 (00:17 +0200)]
Merge commit 'eb8b05a3824a9fa85e20d603595ac8a3b83505d4'

* commit 'eb8b05a3824a9fa85e20d603595ac8a3b83505d4':
  http: Add an option for forcing basic authentication

Conflicts:
libavformat/http.c
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'eb90a2091ffb94d8c29aaa5ff50f4192520254fc'
Michael Niedermayer [Sun, 13 Oct 2013 22:04:52 +0000 (00:04 +0200)]
Merge commit 'eb90a2091ffb94d8c29aaa5ff50f4192520254fc'

* commit 'eb90a2091ffb94d8c29aaa5ff50f4192520254fc':
  pthread: Fix deadlock during thread initialization

Conflicts:
libavcodec/pthread.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/westwood_vqa: s/unsigned char/uint8_t & s/unsigned int/uint32_t
Paul B Mahol [Sun, 13 Oct 2013 20:21:03 +0000 (20:21 +0000)]
avformat/westwood_vqa: s/unsigned char/uint8_t & s/unsigned int/uint32_t

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoavformat: use ff_alloc_extradata()
Paul B Mahol [Sun, 13 Oct 2013 10:30:59 +0000 (10:30 +0000)]
avformat: use ff_alloc_extradata()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoavformat: add ff_alloc_extradata() helper
Paul B Mahol [Sun, 13 Oct 2013 10:19:09 +0000 (10:19 +0000)]
avformat: add ff_alloc_extradata() helper

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoavcodec/jpeg2000dec: prevent out of array accesses in pixel addressing
Michael Niedermayer [Sun, 13 Oct 2013 19:18:23 +0000 (21:18 +0200)]
avcodec/jpeg2000dec: prevent out of array accesses in pixel addressing

Fixes Ticket2921

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/jpeg2000: zero i/f_data
Michael Niedermayer [Sun, 13 Oct 2013 18:26:11 +0000 (20:26 +0200)]
avcodec/jpeg2000: zero i/f_data

Fixes uninitialized use of variables

Fixes part of Ticket2921

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Sun, 13 Oct 2013 17:37:16 +0000 (19:37 +0200)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: add support for changing the channel by the C key
  ffplay: cycle through the streams of the current program, and not every stream
  ffplay: add null packet after attached pics packet
  ffplay: factor out putting null packet into the queue

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/jpeg2000dec: check transform equality in MCT
Michael Niedermayer [Mon, 19 Aug 2013 01:33:40 +0000 (03:33 +0200)]
avcodec/jpeg2000dec: check transform equality in MCT

Fixes null pointer dereference
Fixes Ticket2843

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/oggparseopus: fix nb_headers
Michael Niedermayer [Sun, 13 Oct 2013 16:24:08 +0000 (18:24 +0200)]
avformat/oggparseopus: fix nb_headers

Line comes from ecab1c77410f023b437c6ed3a3281be8f039e574
and was not merged previously

Thanks-to: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agocavs: Check for negative cbp
Luca Barbato [Sun, 13 Oct 2013 01:30:06 +0000 (03:30 +0200)]
cavs: Check for negative cbp

Sample-Id: 00000647-google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agocavs: Return meaningful error values
Luca Barbato [Sun, 13 Oct 2013 01:27:39 +0000 (03:27 +0200)]
cavs: Return meaningful error values

7 years agocavs: K&R formatting cosmetics
Luca Barbato [Sun, 13 Oct 2013 01:08:51 +0000 (03:08 +0200)]
cavs: K&R formatting cosmetics

7 years agoffplay: add support for changing the channel by the C key
Marton Balint [Sun, 6 Oct 2013 18:23:34 +0000 (20:23 +0200)]
ffplay: add support for changing the channel by the C key

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agoffplay: cycle through the streams of the current program, and not every stream
Marton Balint [Sun, 26 Aug 2012 19:07:25 +0000 (21:07 +0200)]
ffplay: cycle through the streams of the current program, and not every stream

When changing the audio, video or subtitle stream, from now on, ffplay will
cycle through the streams of the current program.

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agoffplay: add null packet after attached pics packet
Marton Balint [Sun, 6 Oct 2013 17:12:15 +0000 (19:12 +0200)]
ffplay: add null packet after attached pics packet

Fixes ticket #2904.

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agoffplay: factor out putting null packet into the queue
Marton Balint [Sun, 6 Oct 2013 17:09:49 +0000 (19:09 +0200)]
ffplay: factor out putting null packet into the queue

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agohttp: Support auth method detection for POST
Martin Storsjö [Wed, 9 Oct 2013 10:24:40 +0000 (13:24 +0300)]
http: Support auth method detection for POST

Inspired by a patch by Jakob van Bethlehem. But instead of doing
an empty POST first to trigger the WWW-Authenticate header (which
would succeed if no auth actually was required), add an Expect:
100-continue header, which is meant to be used exactly for
cases like this.

The header is added if doing a post, and the user has specified
authentication but we don't know the auth method yet.

Not all common HTTP servers support the Expect: 100-continue header,
though, so we only try to use it when it really is needed. The user
can request it to be added for other POST requests as well via
an option - which would allow the caller to know immediately that
the POST has failed (e.g. if no auth was provided but the server
required it, or if the target URL simply doesn't exist).

This is only done for write mode posts (e.g. posts without pre-set
post_data) - for posts with pre-set data, we can just redo the post
if it failed due to 401.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agohttp: Add an option for forcing basic authentication
Martin Storsjö [Wed, 9 Oct 2013 09:14:02 +0000 (12:14 +0300)]
http: Add an option for forcing basic authentication

The default is to autodetect the auth method. This does require one
extra request (and also closing and reopening the http connection).
For some cases such as HTTP POST, the autodetection is not handled
properly (yet).

No option is added for digest, since this method requires getting
nonce parameters from the server first and can't be used straight
away like Basic.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoavformat/vocdec: return AVERROR_EOF when EOF is reached
Paul B Mahol [Sat, 12 Oct 2013 20:30:12 +0000 (20:30 +0000)]
avformat/vocdec: return AVERROR_EOF when EOF is reached

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agopthread: Fix deadlock during thread initialization
Derek Buitenhuis [Thu, 10 Oct 2013 15:05:40 +0000 (11:05 -0400)]
pthread: Fix deadlock during thread initialization

Sometimes, if pthread_create() failed, then pthread_cond_wait() could
accidentally be called in the worker threads after the uninit function
had already called pthread_cond_broadcast(), leading to a deadlock.

Don't call pthread_cond_wait() if c->done is set.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
7 years agodoc/developer: Merge license related policy items
Michael Niedermayer [Fri, 11 Oct 2013 21:00:16 +0000 (23:00 +0200)]
doc/developer: Merge license related policy items

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 13 Oct 2013 08:36:59 +0000 (10:36 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  indeo4: Check the inherited quant_mat

Conflicts:
libavcodec/indeo4.c

See: 884efd4e09696b201457feebdef684aee30be99d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '0cb83c563848bf8f8365e7bd30e7e6b57ef360f0'
Michael Niedermayer [Sun, 13 Oct 2013 08:19:15 +0000 (10:19 +0200)]
Merge commit '0cb83c563848bf8f8365e7bd30e7e6b57ef360f0'

* commit '0cb83c563848bf8f8365e7bd30e7e6b57ef360f0':
  indeo4: Check the block size if reusing the band configuration

Conflicts:
libavcodec/indeo4.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'fd2384f02b905a106fba9222ece4ddbe2ec61937'
Michael Niedermayer [Sun, 13 Oct 2013 07:56:56 +0000 (09:56 +0200)]
Merge commit 'fd2384f02b905a106fba9222ece4ddbe2ec61937'

* commit 'fd2384f02b905a106fba9222ece4ddbe2ec61937':
  oggparsevorbis: fail on memory allocation error

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'c18375ec8040a9fe0f186b2033dc975883143758'
Michael Niedermayer [Sun, 13 Oct 2013 07:49:50 +0000 (09:49 +0200)]
Merge commit 'c18375ec8040a9fe0f186b2033dc975883143758'

* commit 'c18375ec8040a9fe0f186b2033dc975883143758':
  oggvorbisdec: add support for embedded cover art

Conflicts:
libavformat/oggparsevorbis.c

See: 193782216fc8179ec92d498449be0a51e4c7c658
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '601d6228c4811d8971a2412a759e1a4ab775ebe8'
Michael Niedermayer [Sun, 13 Oct 2013 07:34:51 +0000 (09:34 +0200)]
Merge commit '601d6228c4811d8971a2412a759e1a4ab775ebe8'

* commit '601d6228c4811d8971a2412a759e1a4ab775ebe8':
  flac: move picture parsing code in a separate file

Conflicts:
libavformat/Makefile
libavformat/flacdec.c

See: 1e5bbbfcf303ec3db0c7db30b85855e2e5358aec
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'ecab1c77410f023b437c6ed3a3281be8f039e574'
Michael Niedermayer [Sun, 13 Oct 2013 07:07:59 +0000 (09:07 +0200)]
Merge commit 'ecab1c77410f023b437c6ed3a3281be8f039e574'

* commit 'ecab1c77410f023b437c6ed3a3281be8f039e574':
  oggdec: add support for Opus in Ogg demuxing

Conflicts:
Changelog
libavformat/oggparseopus.c
libavformat/version.h

See: e62fd6619f7aa91956a1b4ccfa7b0b8d7bc4ba90
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'ed9245dba83f9add60f55718b537b0af2105c60e'
Michael Niedermayer [Sun, 13 Oct 2013 06:43:50 +0000 (08:43 +0200)]
Merge commit 'ed9245dba83f9add60f55718b537b0af2105c60e'

* commit 'ed9245dba83f9add60f55718b537b0af2105c60e':
  oggparsevorbis: check allocations

Conflicts:
libavformat/oggparsevorbis.c

See: 033f1644b59abd755bb529afa5db394d18d9c30b
See: 84aea80f7824c23b4cbf101f03e2b5b418a79d80
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '9c15ef35d404fca2adc31276c1eedb11cf485461'
Michael Niedermayer [Sun, 13 Oct 2013 06:27:03 +0000 (08:27 +0200)]
Merge commit '9c15ef35d404fca2adc31276c1eedb11cf485461'

* commit '9c15ef35d404fca2adc31276c1eedb11cf485461':
  oggparsevorbis: support official chapter extension

Conflicts:
libavformat/oggparsevorbis.c

See: 04b9836274f390e39879c2666f7967990f0382cc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '16ea20c827ef2ffaf77d5e05d5cf9983689f7b2b'
Michael Niedermayer [Sun, 13 Oct 2013 06:16:43 +0000 (08:16 +0200)]
Merge commit '16ea20c827ef2ffaf77d5e05d5cf9983689f7b2b'

* commit '16ea20c827ef2ffaf77d5e05d5cf9983689f7b2b':
  lavc doxy: extend/clarify avcodec_decode_audio4() doxy

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '66d3f5fd5ca4cb3d09b52ad1041cd4359325a21a'
Michael Niedermayer [Sun, 13 Oct 2013 06:07:58 +0000 (08:07 +0200)]
Merge commit '66d3f5fd5ca4cb3d09b52ad1041cd4359325a21a'

* commit '66d3f5fd5ca4cb3d09b52ad1041cd4359325a21a':
  lavc doxy: remove false statements about alignment requirements.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '364af376f343d4706c4cdb7ab9fe0863994e6c01'
Michael Niedermayer [Sun, 13 Oct 2013 05:50:33 +0000 (07:50 +0200)]
Merge commit '364af376f343d4706c4cdb7ab9fe0863994e6c01'

* commit '364af376f343d4706c4cdb7ab9fe0863994e6c01':
  FATE: add lavr resampling tests

The tests do not pass, and thus where disabled

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '9ab5f7107d2f1411e9fda6c36af64524e5ed31d1'
Michael Niedermayer [Sun, 13 Oct 2013 05:00:48 +0000 (07:00 +0200)]
Merge commit '9ab5f7107d2f1411e9fda6c36af64524e5ed31d1'

* commit '9ab5f7107d2f1411e9fda6c36af64524e5ed31d1':
  FATE: add lavr mixing tests

The tests do not pass, and thus where disabled

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'df6737a55f5dc7c0ae5272bc5fa6182836d5481c'
Michael Niedermayer [Sun, 13 Oct 2013 04:42:44 +0000 (06:42 +0200)]
Merge commit 'df6737a55f5dc7c0ae5272bc5fa6182836d5481c'

* commit 'df6737a55f5dc7c0ae5272bc5fa6182836d5481c':
  audio_mix: fix channel order in mix_1_to_2_fltp_flt_c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoindeo4: Check the inherited quant_mat
Luca Barbato [Fri, 11 Oct 2013 09:34:03 +0000 (11:34 +0200)]
indeo4: Check the inherited quant_mat

Invalidate it if not supported.

Sample-Id: 00000262-google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agoindeo4: Check the block size if reusing the band configuration
Luca Barbato [Fri, 11 Oct 2013 08:51:53 +0000 (10:51 +0200)]
indeo4: Check the block size if reusing the band configuration

Sample-Id: 00000287-google

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agolavc: rename h265 to hevc, add AV_CODEC_ID_H265 with identical value for backward...
Michael Niedermayer [Sat, 12 Oct 2013 11:29:31 +0000 (13:29 +0200)]
lavc: rename h265 to hevc, add AV_CODEC_ID_H265 with identical value for backward compatibility

Somehow 2 different identifiers have come into existence which makes supporting
both until the next major version bump required
I did not investigate how exactly that did happen.

wm4, j-b and smarter prefer hevc.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/avr: use ff_get_pcm_codec_id()
Paul B Mahol [Sat, 12 Oct 2013 20:21:38 +0000 (20:21 +0000)]
avformat/avr: use ff_get_pcm_codec_id()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoavfilter/vsrc_testsrc: smpte(hd)bars: use yuv directly
Paul B Mahol [Sat, 12 Oct 2013 17:52:12 +0000 (17:52 +0000)]
avfilter/vsrc_testsrc: smpte(hd)bars: use yuv directly

Also set color space.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoavfilter/vf_separatefields: do not reset pts to 0
Paul B Mahol [Sat, 12 Oct 2013 14:55:42 +0000 (14:55 +0000)]
avfilter/vf_separatefields: do not reset pts to 0

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agooggparsevorbis: fail on memory allocation error
Vittorio Giovara [Sat, 12 Oct 2013 13:37:56 +0000 (15:37 +0200)]
oggparsevorbis: fail on memory allocation error

7 years agooggvorbisdec: add support for embedded cover art
James Almer [Tue, 9 Jul 2013 05:39:10 +0000 (02:39 -0300)]
oggvorbisdec: add support for embedded cover art

Signed-off-by: James Almer <jamrial@gmail.com>
7 years agoflac: move picture parsing code in a separate file
James Almer [Tue, 9 Jul 2013 05:39:09 +0000 (02:39 -0300)]
flac: move picture parsing code in a separate file

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agooggdec: add support for Opus in Ogg demuxing
Nicolas George [Sun, 24 Jun 2012 09:38:18 +0000 (11:38 +0200)]
oggdec: add support for Opus in Ogg demuxing

7 years agooggparsevorbis: check allocations
Vittorio Giovara [Sat, 5 Oct 2013 19:35:31 +0000 (21:35 +0200)]
oggparsevorbis: check allocations

Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agooggparsevorbis: support official chapter extension
James Almer [Sat, 5 Oct 2013 19:33:41 +0000 (21:33 +0200)]
oggparsevorbis: support official chapter extension

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agolavc doxy: extend/clarify avcodec_decode_audio4() doxy
Anton Khirnov [Tue, 8 Oct 2013 06:53:50 +0000 (08:53 +0200)]
lavc doxy: extend/clarify avcodec_decode_audio4() doxy

Elaborate on flushing the decoder.

7 years agolavc doxy: remove false statements about alignment requirements.
Anton Khirnov [Tue, 8 Oct 2013 06:28:03 +0000 (08:28 +0200)]
lavc doxy: remove false statements about alignment requirements.

The packet data does not need to be aligned.

7 years agoFATE: add lavr resampling tests
Anton Khirnov [Mon, 30 Sep 2013 10:15:02 +0000 (12:15 +0200)]
FATE: add lavr resampling tests

7 years agoFATE: add lavr mixing tests
Anton Khirnov [Mon, 30 Sep 2013 10:15:02 +0000 (12:15 +0200)]
FATE: add lavr mixing tests

7 years agoaudio_mix: fix channel order in mix_1_to_2_fltp_flt_c
Anton Khirnov [Wed, 2 Oct 2013 14:40:02 +0000 (16:40 +0200)]
audio_mix: fix channel order in mix_1_to_2_fltp_flt_c

CC:libav-stable@libav.org

7 years agoMerge remote-tracking branch 'lukaszmluki/master'
Michael Niedermayer [Sat, 12 Oct 2013 12:14:48 +0000 (14:14 +0200)]
Merge remote-tracking branch 'lukaszmluki/master'

* lukaszmluki/master:
  avformat/ftp: add log regarding passive mode failure
  avformat/ftp: fix possible deadlock
  avdevice/pulse_audio_enc: fix stream index

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 12 Oct 2013 12:03:50 +0000 (14:03 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  riff: Add a mapping for VP6A

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/ftp: add log regarding passive mode failure
Lukasz Marek [Sat, 12 Oct 2013 11:50:22 +0000 (13:50 +0200)]
avformat/ftp: add log regarding passive mode failure

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
7 years agoavformat/ftp: fix possible deadlock
Lukasz Marek [Sat, 12 Oct 2013 10:53:54 +0000 (12:53 +0200)]
avformat/ftp: fix possible deadlock

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
7 years agoavdevice/pulse_audio_enc: fix stream index
Lukasz Marek [Sat, 12 Oct 2013 10:51:41 +0000 (12:51 +0200)]
avdevice/pulse_audio_enc: fix stream index

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>