ffmpeg.git
7 years agoswr: add noise_scale field to seperate it from the noise shaping scales
Michael Niedermayer [Wed, 9 Jan 2013 23:25:09 +0000 (00:25 +0100)]
swr: add noise_scale field to seperate it from the noise shaping scales

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: fix the noise sample type for noise shaping
Michael Niedermayer [Wed, 9 Jan 2013 22:20:24 +0000 (23:20 +0100)]
swr: fix the noise sample type for noise shaping

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: split swri_dither_init() out
Michael Niedermayer [Wed, 9 Jan 2013 21:46:32 +0000 (22:46 +0100)]
swr: split swri_dither_init() out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc: add noise shaping dithers
Michael Niedermayer [Wed, 9 Jan 2013 19:12:50 +0000 (20:12 +0100)]
doc: add noise shaping dithers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoAdd -movflags rtphint documentation.
Carl Eugen Hoyos [Wed, 9 Jan 2013 22:13:40 +0000 (23:13 +0100)]
Add -movflags rtphint documentation.

7 years agoswr: remove unused variable
Michael Niedermayer [Wed, 9 Jan 2013 17:41:40 +0000 (18:41 +0100)]
swr: remove unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: move dither related fields to their own context
Michael Niedermayer [Wed, 9 Jan 2013 17:41:12 +0000 (18:41 +0100)]
swr: move dither related fields to their own context

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: update copyright years of a few files iam working on
Michael Niedermayer [Wed, 9 Jan 2013 17:30:01 +0000 (18:30 +0100)]
swr: update copyright years of a few files iam working on

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: Implement Noise shaping dither
Michael Niedermayer [Wed, 9 Jan 2013 17:03:49 +0000 (18:03 +0100)]
swr: Implement Noise shaping dither

The following variants are implemented:
lipshitz noise shaping dither
shibata noise shaping dither
low shibata noise shaping dither
high shibata noise shaping dither
f-weighted noise shaping dither
modified-e-weighted noise shaping dither
improved-e-weighted noise shaping dither

Data tables taken from SOX

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofrmdec: tag 5 is AV_PIX_FMT_BGRA with reversed alpha (0=solid/opaque .. 255=transparent)
Peter Ross [Mon, 7 Jan 2013 11:08:39 +0000 (22:08 +1100)]
frmdec: tag 5 is AV_PIX_FMT_BGRA with reversed alpha (0=solid/opaque ..  255=transparent)

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 9 Jan 2013 11:30:14 +0000 (12:30 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  xan: Convert to bytestream2
  oggenc: add a page_duration option and deprecate the pagesize option
  x86: lavr: add SSE2/AVX dither_int_to_float()

Conflicts:
libavcodec/xan.c
libavformat/oggenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '1fb8f6a44f06e48386450fe0363aefc02583d24a'
Michael Niedermayer [Wed, 9 Jan 2013 11:13:58 +0000 (12:13 +0100)]
Merge commit '1fb8f6a44f06e48386450fe0363aefc02583d24a'

* commit '1fb8f6a44f06e48386450fe0363aefc02583d24a':
  x86: lavr: add SSE2 quantize() for dithering
  doc/APIchanges: fill in missing dates and hashes.
  rtpdec_vp8: Request a keyframe if RTP packets are lost

Conflicts:
doc/APIchanges

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '86d9181cf41edc3382bf2481f95a2fb321058689'
Michael Niedermayer [Wed, 9 Jan 2013 10:48:14 +0000 (11:48 +0100)]
Merge commit '86d9181cf41edc3382bf2481f95a2fb321058689'

* commit '86d9181cf41edc3382bf2481f95a2fb321058689':
  rtpdec: Support sending RTCP feedback packets

Conflicts:
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '42805eda554a7fc44341282771531e7837ac72b7'
Michael Niedermayer [Wed, 9 Jan 2013 10:41:56 +0000 (11:41 +0100)]
Merge commit '42805eda554a7fc44341282771531e7837ac72b7'

* commit '42805eda554a7fc44341282771531e7837ac72b7':
  rtpdec: Store the dynamic payload handler in the rtpdec context

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '9c80ed836a511293f4cc3a858060969d32f2b1ce'
Michael Niedermayer [Wed, 9 Jan 2013 10:35:46 +0000 (11:35 +0100)]
Merge commit '9c80ed836a511293f4cc3a858060969d32f2b1ce'

* commit '9c80ed836a511293f4cc3a858060969d32f2b1ce':
  rtpdec_vp8: Avoid a warning about a possibly unused variable
  rtpdec_vp8: Make sure the previous packet is returned

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '92e354b655613b88c3c202a7e19e7037daed37eb'
Michael Niedermayer [Wed, 9 Jan 2013 10:26:31 +0000 (11:26 +0100)]
Merge commit '92e354b655613b88c3c202a7e19e7037daed37eb'

* commit '92e354b655613b88c3c202a7e19e7037daed37eb':
  rtpdec_vp8: Set the timestamp when returning a deferred packet
  hlsenc: Make the start_number option set the right variable

Conflicts:
libavformat/hlsenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoxan: Convert to bytestream2
Alexandra Khirnova [Tue, 8 Jan 2013 20:47:20 +0000 (21:47 +0100)]
xan: Convert to bytestream2

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agoswr: use SIMD for dithering
Michael Niedermayer [Wed, 9 Jan 2013 01:05:35 +0000 (02:05 +0100)]
swr: use SIMD for dithering

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodirac: fix inverted check
Michael Niedermayer [Tue, 8 Jan 2013 23:43:31 +0000 (00:43 +0100)]
dirac: fix inverted check

Regression since: ea6da80
Fixes Ticket2123

I cannot reproduce any regressions by flipping the wrong condition
to how it should have been.

Thanks-to: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf/mux: do not pass a copy of the packet to write_packet().
Clément Bœsch [Tue, 8 Jan 2013 21:39:25 +0000 (22:39 +0100)]
lavf/mux: do not pass a copy of the packet to write_packet().

Sometimes the muxer modifies the packet, like for instance lavf/mp3enc
changing pkt->destruct in order to keep a copy. These changes must be
kept, even though the muxer behaviour is questionable. Regression since
0072116.

Fixes #2124.

7 years agooggenc: add a page_duration option and deprecate the pagesize option
Justin Ruggles [Sun, 30 Dec 2012 22:00:00 +0000 (17:00 -0500)]
oggenc: add a page_duration option and deprecate the pagesize option

This uses page duration instead of byte size to determine when to buffer
the page. Also, it tries to avoid continued pages by buffering the current
page if there are already packets in the page and adding the next packet
would require it to be continued on a new page. This can improve seeking
performance.

The default page duration is 1 second, which is much saner than filling
all page segments by default.

7 years agox86: lavr: add SSE2 quantize() for dithering
Justin Ruggles [Wed, 31 Oct 2012 19:40:12 +0000 (15:40 -0400)]
x86: lavr: add SSE2 quantize() for dithering

7 years agox86: lavr: add SSE2/AVX dither_int_to_float()
Justin Ruggles [Wed, 31 Oct 2012 19:40:12 +0000 (15:40 -0400)]
x86: lavr: add SSE2/AVX dither_int_to_float()

7 years agodoc/APIchanges: fill in missing dates and hashes.
Justin Ruggles [Tue, 8 Jan 2013 03:04:30 +0000 (22:04 -0500)]
doc/APIchanges: fill in missing dates and hashes.

7 years agoffmpeg: fix dither to 24bit PCM output
Michael Niedermayer [Tue, 8 Jan 2013 16:17:31 +0000 (17:17 +0100)]
ffmpeg: fix dither to 24bit PCM output

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: fix assertion failure if dither is used without the preout buffer differing...
Michael Niedermayer [Tue, 8 Jan 2013 15:55:46 +0000 (16:55 +0100)]
swr: fix assertion failure if dither is used without the preout buffer differing from in

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoimg2dec: fix -loop
Michael Niedermayer [Tue, 8 Jan 2013 19:06:09 +0000 (20:06 +0100)]
img2dec: fix -loop

This fixes a infinite loop with -loop and -vframes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoFix compilation with --disable-everything --enable-decoder=dirac.
Carl Eugen Hoyos [Tue, 8 Jan 2013 18:59:13 +0000 (19:59 +0100)]
Fix compilation with --disable-everything --enable-decoder=dirac.

7 years agofate: upate after 55d32eed8f
Paul B Mahol [Tue, 8 Jan 2013 18:47:09 +0000 (18:47 +0000)]
fate: upate after 55d32eed8f

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agortpdec_vp8: Request a keyframe if RTP packets are lost
Martin Storsjö [Tue, 11 Dec 2012 14:03:33 +0000 (16:03 +0200)]
rtpdec_vp8: Request a keyframe if RTP packets are lost

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoimg2dec: do not change packet pts for image2pipe
Paul B Mahol [Tue, 8 Jan 2013 16:50:26 +0000 (16:50 +0000)]
img2dec: do not change packet pts for image2pipe

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agortpdec: Support sending RTCP feedback packets
Martin Storsjö [Tue, 11 Dec 2012 13:59:24 +0000 (15:59 +0200)]
rtpdec: Support sending RTCP feedback packets

This sends NACK for missed packets and PLI (picture loss indication)
if a depacketizer indicates that it needs a new keyframe, according
to RFC 4585.

This is only enabled if the SDP indicated that feedback is supported
(via the AVPF or SAVPF profile names).

The feedback packets are throttled to a certain maximum interval
(currently 250 ms) to make sure the feedback packets don't eat up
too much bandwidth (which might be counterproductive). The RFC
specifies a more elaborate feedback packet scheduling.

The feedback packets are currently sent independently from normal
RTCP RR packets, which is not totally spec compliant, but works
fine in the environments I've tested it in. (RFC 5506 allows this,
but requires a SDP attribute for enabling it.)

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agortpdec: Store the dynamic payload handler in the rtpdec context
Martin Storsjö [Tue, 11 Dec 2012 13:52:18 +0000 (15:52 +0200)]
rtpdec: Store the dynamic payload handler in the rtpdec context

This allows calling other dynamic payload handler functions if
needed.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agortpdec_vp8: Avoid a warning about a possibly unused variable
Martin Storsjö [Mon, 7 Jan 2013 20:02:07 +0000 (22:02 +0200)]
rtpdec_vp8: Avoid a warning about a possibly unused variable

The warning is a false positive, but I prefer actually initializing
it over masking it with av_uninit, since the code is not performance
critical.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agortpdec_vp8: Make sure the previous packet is returned
Martin Storsjö [Mon, 7 Jan 2013 19:42:46 +0000 (21:42 +0200)]
rtpdec_vp8: Make sure the previous packet is returned

This is a bug from c7d4de3d73 - if the previous frame wasn't
returned yet (due to missing the final packets), but we have
enough data of it to return the first partition, we write that into
pkt and set returned_old_frame. That commit forgot returning 0 for
the case where this current packet didn't have the end_packet flag
set.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agortpdec_vp8: Set the timestamp when returning a deferred packet
Martin Storsjö [Mon, 7 Jan 2013 19:42:40 +0000 (21:42 +0200)]
rtpdec_vp8: Set the timestamp when returning a deferred packet

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agohlsenc: Make the start_number option set the right variable
Kanglin [Sat, 5 Jan 2013 08:50:04 +0000 (16:50 +0800)]
hlsenc: Make the start_number option set the right variable

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoimg2dec: seeking support
Paul B Mahol [Tue, 8 Jan 2013 11:43:07 +0000 (11:43 +0000)]
img2dec: seeking support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoff_find_pix_fmt: return NONE for the "not found" case.
Michael Niedermayer [Tue, 8 Jan 2013 13:28:28 +0000 (14:28 +0100)]
ff_find_pix_fmt: return NONE for the "not found" case.

Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi: fix use-after-free in ff_filter_frame.
Nicolas George [Tue, 8 Jan 2013 11:46:13 +0000 (12:46 +0100)]
lavfi: fix use-after-free in ff_filter_frame.

Unlike the original ff_start_frame code, the incoming reference
may be freed before that point.

Fix CID966654.

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 8 Jan 2013 12:14:32 +0000 (13:14 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtsp: Respect max_delay for the reordering queue when using custom IO

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '8729698d50739524665090e083d1bfdf28235724'
Michael Niedermayer [Tue, 8 Jan 2013 12:05:02 +0000 (13:05 +0100)]
Merge commit '8729698d50739524665090e083d1bfdf28235724'

* commit '8729698d50739524665090e083d1bfdf28235724':
  rtsp: Recheck the reordering queue if getting a new packet
  lavr: log channel conversion description for any-to-any functions
  lavr: mix: reduce the mixing matrix when possible
  lavr: cosmetics: reindent

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '074a00d192c0e749d677b008b337da42597e780f'
Michael Niedermayer [Tue, 8 Jan 2013 11:56:41 +0000 (12:56 +0100)]
Merge commit '074a00d192c0e749d677b008b337da42597e780f'

* commit '074a00d192c0e749d677b008b337da42597e780f':
  lavr: add a public function for setting a custom channel map
  lavr: typedef internal structs in internal.h
  doc: Extend commit message section

Conflicts:
doc/APIchanges
doc/developer.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'ac2603be28602bea76cf38bdbf37aead0dc2979a'
Michael Niedermayer [Tue, 8 Jan 2013 11:48:21 +0000 (12:48 +0100)]
Merge commit 'ac2603be28602bea76cf38bdbf37aead0dc2979a'

* commit 'ac2603be28602bea76cf38bdbf37aead0dc2979a':
  doc: Mention memory allocation in the fuzz testing section

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'dc3e12d1cb65d74fb120197ce869a205718b6715'
Michael Niedermayer [Tue, 8 Jan 2013 11:46:53 +0000 (12:46 +0100)]
Merge commit 'dc3e12d1cb65d74fb120197ce869a205718b6715'

* commit 'dc3e12d1cb65d74fb120197ce869a205718b6715':
  doc: Mention zzuf in the fuzz testing section

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'b5f9b9ac3681acb06d95530f34660ba9fe225305'
Michael Niedermayer [Tue, 8 Jan 2013 11:45:24 +0000 (12:45 +0100)]
Merge commit 'b5f9b9ac3681acb06d95530f34660ba9fe225305'

* commit 'b5f9b9ac3681acb06d95530f34660ba9fe225305':
  doc: Merge disjointed bits about emailing patches

Conflicts:
doc/developer.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '9a00374cb4512a58a1fee366b850dfa87c76e1f3'
Michael Niedermayer [Tue, 8 Jan 2013 11:34:14 +0000 (12:34 +0100)]
Merge commit '9a00374cb4512a58a1fee366b850dfa87c76e1f3'

* commit '9a00374cb4512a58a1fee366b850dfa87c76e1f3':
  doc: Fix a few typos in the developer documentation
  xwma: Remove unused variable
  asfdec: Fix printf format string length modifier

Conflicts:
doc/developer.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agortsp: Respect max_delay for the reordering queue when using custom IO
Martin Storsjö [Mon, 7 Jan 2013 19:26:59 +0000 (21:26 +0200)]
rtsp: Respect max_delay for the reordering queue when using custom IO

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agortsp: Recheck the reordering queue if getting a new packet
Martin Storsjö [Mon, 7 Jan 2013 16:39:04 +0000 (18:39 +0200)]
rtsp: Recheck the reordering queue if getting a new packet

If we timed out and consumed a packet from the reordering queue,
but didn't return a packet to the caller, recheck the queue status.
Otherwise, we could end up in an infinite loop, trying to consume
a queued packet that has already been consumed.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agolavr: log channel conversion description for any-to-any functions
Justin Ruggles [Sat, 29 Dec 2012 19:22:55 +0000 (14:22 -0500)]
lavr: log channel conversion description for any-to-any functions

7 years agolavr: add a public function for setting a custom channel map
Justin Ruggles [Wed, 19 Dec 2012 19:58:57 +0000 (14:58 -0500)]
lavr: add a public function for setting a custom channel map

This allows reordering, duplication, and silencing of input channels.

7 years agolavr: mix: reduce the mixing matrix when possible
Justin Ruggles [Fri, 28 Dec 2012 21:58:55 +0000 (16:58 -0500)]
lavr: mix: reduce the mixing matrix when possible

If the matrix results in an output channel not getting a contribution
from any input channel and the corresponding input channel does not
contribute to any outputs, we can skip the channel during mixing and
silence it after mixing.

If the matrix results in an input channel not contributing to any output
channels and it is not in the output mix, or if the input channel only
contributes fully to the same output channel, we can skip the channel
during mixing.

If the matrix results in an output channel only getting full
contribution from the corresponding input channel and that input channel
does not contribute to any other output channels, we can skip the
channel during mixing.

7 years agolavr: cosmetics: reindent
Justin Ruggles [Fri, 21 Dec 2012 21:31:26 +0000 (16:31 -0500)]
lavr: cosmetics: reindent

7 years agolavr: typedef internal structs in internal.h
Justin Ruggles [Fri, 21 Dec 2012 21:26:51 +0000 (16:26 -0500)]
lavr: typedef internal structs in internal.h

Simplifies header dependencies by not including all other internal headers
in internal.h.

7 years agooggparseskeleton: Check the overall start time before using it.
Michael Niedermayer [Tue, 8 Jan 2013 01:52:15 +0000 (02:52 +0100)]
oggparseskeleton: Check the overall start time before using it.

Fixes division by zero

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomjpegdec: allow 2 components in ljpeg_decode_yuv_scan()
Michael Niedermayer [Tue, 8 Jan 2013 01:30:02 +0000 (02:30 +0100)]
mjpegdec: allow 2 components in ljpeg_decode_yuv_scan()

Fixes assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoAdd forgotten AVC Intra entry to Changelog.
Carl Eugen Hoyos [Tue, 8 Jan 2013 00:08:36 +0000 (01:08 +0100)]
Add forgotten AVC Intra entry to Changelog.

7 years agolavf/utils: more complete dts checks
Michael Niedermayer [Mon, 7 Jan 2013 23:24:46 +0000 (00:24 +0100)]
lavf/utils: more complete dts checks

Fixes division by zero

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosvq1dec: check that the reference frame matches in size before using it.
Michael Niedermayer [Mon, 7 Jan 2013 22:42:35 +0000 (23:42 +0100)]
svq1dec: check that the reference frame matches in size before using it.

Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavc: fix forgotten "que" reference.
Clément Bœsch [Mon, 7 Jan 2013 21:07:50 +0000 (22:07 +0100)]
lavc: fix forgotten "que" reference.

This should have been part of 491ca0e8.

7 years agormdec: Limit videobufsize to remaining amount of data
Michael Niedermayer [Mon, 7 Jan 2013 20:31:40 +0000 (21:31 +0100)]
rmdec: Limit videobufsize to remaining amount of data

Fixes excessive memory allocation

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agorv10: always check direct mode interpolation times.
Michael Niedermayer [Mon, 7 Jan 2013 20:16:23 +0000 (21:16 +0100)]
rv10: always check direct mode interpolation times.

Fixes Division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc: Mention memory allocation in the fuzz testing section
Derek Buitenhuis [Sun, 6 Jan 2013 18:25:07 +0000 (13:25 -0500)]
doc: Mention memory allocation in the fuzz testing section

It's obviously undesireable to blindly allocate memory based on
a damaged 'size' value, for example.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
7 years agodoc: Mention zzuf in the fuzz testing section
Derek Buitenhuis [Sun, 6 Jan 2013 18:24:06 +0000 (13:24 -0500)]
doc: Mention zzuf in the fuzz testing section

It's pretty much the best tool for the job, and it's what we
all use now anyway.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
7 years agodoc: Extend commit message section
Derek Buitenhuis [Sun, 6 Jan 2013 18:33:13 +0000 (13:33 -0500)]
doc: Extend commit message section

If a bug exists on the tracker, its ID should always be included
in fix messages.

Also, any relevant bug fixes should be CC'd to libav-stable, so
we can actually track what needs to be backported, instead of
just randomly combing the git history and old CVEs.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
7 years agodoc: Merge disjointed bits about emailing patches
Derek Buitenhuis [Sun, 6 Jan 2013 18:10:27 +0000 (13:10 -0500)]
doc: Merge disjointed bits about emailing patches

We obviously prefer git-send-email(1), and the disjointed nature
of the two statements was misleading.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
7 years agodoc: Fix a few typos in the developer documentation
Derek Buitenhuis [Sun, 6 Jan 2013 18:21:18 +0000 (13:21 -0500)]
doc: Fix a few typos in the developer documentation

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
7 years agowtvdec: prevent memory leak in get_tag()
Peter Ross [Mon, 7 Jan 2013 14:48:13 +0000 (01:48 +1100)]
wtvdec: prevent memory leak in get_tag()

7 years agompeg12enc: check dimension validity
Michael Niedermayer [Mon, 7 Jan 2013 14:47:21 +0000 (15:47 +0100)]
mpeg12enc: check dimension validity

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompeg12enc: Correctly mask dimensions
Michael Niedermayer [Mon, 7 Jan 2013 14:31:58 +0000 (15:31 +0100)]
mpeg12enc: Correctly mask dimensions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompeg12: Support decoding dimensions that are a multiple of 4096
Michael Niedermayer [Mon, 7 Jan 2013 14:31:00 +0000 (15:31 +0100)]
mpeg12: Support decoding dimensions that are a multiple of 4096

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agooggparsevorbis: fix vorbis_cleanup return type
Michael Niedermayer [Mon, 7 Jan 2013 13:14:41 +0000 (14:14 +0100)]
oggparsevorbis: fix vorbis_cleanup return type

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 7 Jan 2013 13:05:29 +0000 (14:05 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  oggdec: make sure the private parse data is cleaned up

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '89b51b570daa80e6e3790fcd449fe61fc5574e07'
Michael Niedermayer [Mon, 7 Jan 2013 12:32:54 +0000 (13:32 +0100)]
Merge commit '89b51b570daa80e6e3790fcd449fe61fc5574e07'

* commit '89b51b570daa80e6e3790fcd449fe61fc5574e07':
  oggdec: free the ogg streams on read_header failure

Conflicts:
libavformat/oggdec.c

Original commit this was based on: (this merge just moves the function up)
commit 07a866282f08985c65c47ebabcf7b20f1c46daa0
Author: Michael Niedermayer <michaelni@gmx.at>
Date:   Tue Nov 20 15:12:37 2012 +0100

    oggdec: fix memleak on header parsing failure

    Fixes Ticket1931

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoxwma: Remove unused variable
Benjamin Larsson [Sun, 16 Sep 2012 02:09:24 +0000 (04:09 +0200)]
xwma: Remove unused variable

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agowtvdec: warn about truncated files
Peter Ross [Sun, 6 Jan 2013 03:15:25 +0000 (14:15 +1100)]
wtvdec: warn about truncated files

7 years agowtvenc: mux thumbnail picture
Peter Ross [Sun, 6 Jan 2013 03:15:25 +0000 (14:15 +1100)]
wtvenc: mux thumbnail picture

7 years agowtvdec: ignore WM/MediaThumbType metadata entry
Peter Ross [Sun, 6 Jan 2013 03:15:25 +0000 (14:15 +1100)]
wtvdec: ignore WM/MediaThumbType metadata entry

This tag is used by Windows Media Centre in displaying the thumbnail,
and should be transformed into FFmpeg metadata string.

7 years agowtvdec: demux thumbnail picture to AVStream.attached_pic
Peter Ross [Sun, 6 Jan 2013 03:15:24 +0000 (14:15 +1100)]
wtvdec: demux thumbnail picture to AVStream.attached_pic

7 years agoAdd EVRCA and SMV codec id
Paul B Mahol [Mon, 10 Dec 2012 17:48:16 +0000 (17:48 +0000)]
Add EVRCA and SMV codec id

Demuxing files should be possible even if there are
no decoding support in lavc (yet).

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agofrmdec: tag 2 is AV_PIX_FMT_RGB0
Peter Ross [Mon, 7 Jan 2013 10:23:51 +0000 (21:23 +1100)]
frmdec: tag 2 is AV_PIX_FMT_RGB0

7 years agofrmdec: terminate frm_pix_fmt_tags
Peter Ross [Mon, 7 Jan 2013 10:24:25 +0000 (21:24 +1100)]
frmdec: terminate frm_pix_fmt_tags

7 years agofrmdec: use AV_PIX_FMT_xxx
Peter Ross [Mon, 7 Jan 2013 10:48:42 +0000 (21:48 +1100)]
frmdec: use AV_PIX_FMT_xxx

7 years ago012v: remove double ; and return correct error code if ff_get_buffer() fails
Paul B Mahol [Mon, 7 Jan 2013 10:48:02 +0000 (10:48 +0000)]
012v: remove double ; and return correct error code if ff_get_buffer() fails

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoiff: support seeking with maud
Paul B Mahol [Sat, 5 Jan 2013 20:37:49 +0000 (20:37 +0000)]
iff: support seeking with maud

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agow64: fact guid support
Paul B Mahol [Sat, 5 Jan 2013 15:02:08 +0000 (15:02 +0000)]
w64: fact guid support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoChangelog: move Megalux where it belongs
Paul B Mahol [Mon, 7 Jan 2013 09:44:48 +0000 (09:44 +0000)]
Changelog: move Megalux where it belongs

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoasfdec: Fix printf format string length modifier
Diego Biurrun [Mon, 31 Dec 2012 10:26:17 +0000 (11:26 +0100)]
asfdec: Fix printf format string length modifier

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 7 Jan 2013 00:56:31 +0000 (01:56 +0100)]
Merge remote-tracking branch 'qatar/master'

Merge only for metadata, no commits merged

* qatar/master:
  Drop Snow codec
  Prepare for 10_alpha1 Release

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '4f50646697606df39317b93c2a427603b77636ee'
Michael Niedermayer [Mon, 7 Jan 2013 00:51:04 +0000 (01:51 +0100)]
Merge commit '4f50646697606df39317b93c2a427603b77636ee'

* commit '4f50646697606df39317b93c2a427603b77636ee':
  x86: sbrdsp: Implement SSE qmf_post_shuffle

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '44a0036d10579ed91e48df24859e54b08a582742'
Michael Niedermayer [Mon, 7 Jan 2013 00:39:59 +0000 (01:39 +0100)]
Merge commit '44a0036d10579ed91e48df24859e54b08a582742'

* commit '44a0036d10579ed91e48df24859e54b08a582742':
  x86: sbrdsp: Implement SSE sum64x5

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '5b4dfbffc258f90a7d2540d21209ac23afcf7cd0'
Michael Niedermayer [Mon, 7 Jan 2013 00:35:12 +0000 (01:35 +0100)]
Merge commit '5b4dfbffc258f90a7d2540d21209ac23afcf7cd0'

* commit '5b4dfbffc258f90a7d2540d21209ac23afcf7cd0':
  x86: ABS1: port to cpuflags
  v210x: cosmetics, reformat

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '6689474b91049411b5b7986616d1c66b701ae11f'
Michael Niedermayer [Mon, 7 Jan 2013 00:30:23 +0000 (01:30 +0100)]
Merge commit '6689474b91049411b5b7986616d1c66b701ae11f'

* commit '6689474b91049411b5b7986616d1c66b701ae11f':
  v210x: return meaningful error codes.
  r210dec: return meaningful error codes.
  vb: cosmetics, reformat

Conflicts:
libavcodec/vb.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '9dbbda235d93d628777b986e502213f1ed390973'
Michael Niedermayer [Mon, 7 Jan 2013 00:24:32 +0000 (01:24 +0100)]
Merge commit '9dbbda235d93d628777b986e502213f1ed390973'

* commit '9dbbda235d93d628777b986e502213f1ed390973':
  vb: return meaningful error codes.
  ptx: return meaningful error codes.
  tiff: return meaningful error codes.
  vqavideo: return meaningful error codes.
  mss2: return meaningful error codes.
  v210dec: return meaningful error codes
  indeo2: cosmetics, reformat

Conflicts:
libavcodec/indeo2.c
libavcodec/tiff.c
libavcodec/v210dec.c
libavcodec/vb.c
libavcodec/vqavideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '7b1fbd4729a52dd7c02622dbe7bb81a6a7ed12f8'
Michael Niedermayer [Mon, 7 Jan 2013 00:11:14 +0000 (01:11 +0100)]
Merge commit '7b1fbd4729a52dd7c02622dbe7bb81a6a7ed12f8'

* commit '7b1fbd4729a52dd7c02622dbe7bb81a6a7ed12f8':
  indeo2: check decoding errors.
  indeo2: return meaningful error codes
  rl2: cosmetics, reformat

Conflicts:
libavcodec/rl2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '3c6e5a840c45fd3b832e86881602a72e47d46f19'
Michael Niedermayer [Mon, 7 Jan 2013 00:00:04 +0000 (01:00 +0100)]
Merge commit '3c6e5a840c45fd3b832e86881602a72e47d46f19'

* commit '3c6e5a840c45fd3b832e86881602a72e47d46f19':
  rl2: use fixed-width integer types where appropriate
  rl2: return meaningful error codes.
  cljr: return a meaningful error code.
  fraps: cosmetics, reformat

Conflicts:
libavcodec/fraps.c
libavcodec/rl2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '57d11e5e28bfe0bc445ad78fc033aafa73068bb4'
Michael Niedermayer [Sun, 6 Jan 2013 23:38:25 +0000 (00:38 +0100)]
Merge commit '57d11e5e28bfe0bc445ad78fc033aafa73068bb4'

* commit '57d11e5e28bfe0bc445ad78fc033aafa73068bb4':
  fraps: return meaningful error codes.
  kgv1dec: return meaningful error codes.
  kmvc: return meaningful error codes.
  wnv1: return meaningful error codes.
  dpx: return meaningful error codes.
  truemotion1: return meaningful error codes
  pnm: return meaningful error codes.

Conflicts:
libavcodec/dpx.c
libavcodec/fraps.c
libavcodec/kmvc.c
libavcodec/pnm.c
libavcodec/pnmdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '84f2847de394ac447f53306bd4dd73e1af6ea5e4'
Michael Niedermayer [Sun, 6 Jan 2013 22:59:35 +0000 (23:59 +0100)]
Merge commit '84f2847de394ac447f53306bd4dd73e1af6ea5e4'

* commit '84f2847de394ac447f53306bd4dd73e1af6ea5e4':
  xl: return a meaningful error code.
  xan: return a meaningful error code.
  xxan: return meaningful error codes.
  zmbv: return more meaningful error codes.
  yop: use a meaningful error code.
  c93: return meaningful error codes.
  bmv: return meaningful error codes.
  bmp: return meaningful error codes.
  bink: operate with pointers to AVFrames instead of whole structs.
  bink: return meaningful error codes.
  bfi: return meaningful error codes.
  bethsoftvideo: return meaningful error codes.

Conflicts:
libavcodec/c93.c
libavcodec/xl.c
libavcodec/xxan.c
libavcodec/yop.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'e83c1e2d0bedb5d4fa9ab351126b2ecc552f1355'
Michael Niedermayer [Sun, 6 Jan 2013 22:48:48 +0000 (23:48 +0100)]
Merge commit 'e83c1e2d0bedb5d4fa9ab351126b2ecc552f1355'

* commit 'e83c1e2d0bedb5d4fa9ab351126b2ecc552f1355':
  avs: return meaningful error codes.
  aura: return meaningful error codes.
  asvdec: return meaningful error codes.
  ansi: return a meaningful error code
  anm: return meaningful error codes
  aasc: return meaningful error codes.
  8bps: return meaningful error codes.
  4xm: operate with pointers to AVFrames instead of whole structs.
  4xm: eliminate a pointless indirection

Conflicts:
libavcodec/4xm.c
libavcodec/aasc.c
libavcodec/anm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'aa15afb7ce850e2ac688efdef189df5da817a646' n1.2-dev
Michael Niedermayer [Sun, 6 Jan 2013 22:41:19 +0000 (23:41 +0100)]
Merge commit 'aa15afb7ce850e2ac688efdef189df5da817a646'

* commit 'aa15afb7ce850e2ac688efdef189df5da817a646':
  4xm: simplify code with FFSWAP
  4xm: return meaningful error codes

Conflicts:
libavcodec/4xm.c

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