ffmpeg.git
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 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 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 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>
7 years agoMAINTAINERS: add 1.1, remove 0.10
Michael Niedermayer [Sun, 6 Jan 2013 20:40:20 +0000 (21:40 +0100)]
MAINTAINERS: add 1.1, remove 0.10

If someone else wants to maintain a old release, please contact us

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoRELEASE: 1.1.git for master
Michael Niedermayer [Sun, 6 Jan 2013 20:35:09 +0000 (21:35 +0100)]
RELEASE: 1.1.git for master

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoChangelog, update for 1.1 release
Michael Niedermayer [Sun, 6 Jan 2013 20:28:15 +0000 (21:28 +0100)]
Changelog, update for 1.1 release

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoff_get_audio_frame_size: try to fix wma in wav
Michael Niedermayer [Sun, 6 Jan 2013 18:15:16 +0000 (19:15 +0100)]
ff_get_audio_frame_size: try to fix wma in wav

Fixes Ticket1905, Ticket2114

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agotests/fate/avfilter.mak: merge pp tests into GPL test list
Stefano Sabatini [Sun, 6 Jan 2013 17:40:50 +0000 (18:40 +0100)]
tests/fate/avfilter.mak: merge pp tests into GPL test list

The mp=pp filter was removed and replaced with a native implementation,
so the dependency on CONFIG_MP_FILTER stands no more.

7 years agolavfi/kerndeint: remove unused pixel_step.
Clément Bœsch [Sun, 6 Jan 2013 17:54:58 +0000 (18:54 +0100)]
lavfi/kerndeint: remove unused pixel_step.

7 years agolavfi/kerndeint: fix temp buffer linesize.
Clément Bœsch [Sun, 6 Jan 2013 06:23:43 +0000 (07:23 +0100)]
lavfi/kerndeint: fix temp buffer linesize.

Also re-enable the FATE test.

7 years agoSupport decoding AC-3 in wav.
Carl Eugen Hoyos [Sun, 6 Jan 2013 17:48:51 +0000 (18:48 +0100)]
Support decoding AC-3 in wav.

All known samples are actually ac3-in-spdif-in-wav, so use
the spdif demuxer to get the ac3 frames.

7 years agooggdec: make sure the private parse data is cleaned up
Luca Barbato [Fri, 4 Jan 2013 15:05:51 +0000 (16:05 +0100)]
oggdec: make sure the private parse data is cleaned up

7 years agooggdec: free the ogg streams on read_header failure
Luca Barbato [Fri, 4 Jan 2013 14:44:02 +0000 (15:44 +0100)]
oggdec: free the ogg streams on read_header failure

Plug an annoying memory leak on broken files.

7 years ago012v decoder.
Carl Eugen Hoyos [Sun, 6 Jan 2013 16:55:14 +0000 (17:55 +0100)]
012v decoder.

The decoder also supports a12v, but removes the transparency layer
since no samples with actual transparency are available for testing.

7 years agoadd note on windows pipe
rogerdpack [Wed, 26 Dec 2012 19:21:15 +0000 (12:21 -0700)]
add note on windows pipe

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/ffmpeg-resampler: Try to document async
Michael Niedermayer [Sun, 6 Jan 2013 16:05:45 +0000 (17:05 +0100)]
doc/ffmpeg-resampler: Try to document async

Improvements welcome!

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoSupport stereo as experimental feature in mmf / Yamaha SMAF.
Carl Eugen Hoyos [Sun, 6 Jan 2013 15:38:24 +0000 (16:38 +0100)]
Support stereo as experimental feature in mmf / Yamaha SMAF.

Fixes ticket #1085.

7 years agoDrop Snow codec
Diego Biurrun [Mon, 24 Sep 2012 15:57:14 +0000 (17:57 +0200)]
Drop Snow codec

Snow is a toy codec with no real-world use and horrible code.

7 years agoPrepare for 10_alpha1 Release
Reinhard Tartler [Sun, 6 Jan 2013 15:23:12 +0000 (16:23 +0100)]
Prepare for 10_alpha1 Release

7 years agofate: disable kerndeint test
Michael Niedermayer [Sun, 6 Jan 2013 14:07:19 +0000 (15:07 +0100)]
fate: disable kerndeint test

The filter has been added recently and does not yet pass tests on all platforms.
It should not be included in the tests in the release until it works.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomxfenc: avoid depending on private codec structures and functions
Michael Niedermayer [Fri, 4 Jan 2013 20:18:57 +0000 (21:18 +0100)]
mxfenc: avoid depending on private codec structures and functions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodnxhd: Add avpriv_dnxhd_get_frame_size()
Michael Niedermayer [Fri, 4 Jan 2013 20:18:21 +0000 (21:18 +0100)]
dnxhd: Add avpriv_dnxhd_get_frame_size()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agox86: sbrdsp: Implement SSE qmf_post_shuffle
Christophe Gisquet [Sun, 25 Nov 2012 06:55:28 +0000 (07:55 +0100)]
x86: sbrdsp: Implement SSE qmf_post_shuffle

255 to 174 cycles on Arrandale / Win64. Unrolling yields no gain.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agox86: sbrdsp: Implement SSE sum64x5
Christophe Gisquet [Sat, 24 Nov 2012 22:15:07 +0000 (23:15 +0100)]
x86: sbrdsp: Implement SSE sum64x5

698 to 174 cycles on Arrandale. Unrolling is a 6 cycles gain.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agox86: ABS1: port to cpuflags
Diego Biurrun [Sun, 15 Jul 2012 16:11:36 +0000 (18:11 +0200)]
x86: ABS1: port to cpuflags

7 years agocos_tablegen: fix the lack on M_PI
Michael Niedermayer [Sat, 5 Jan 2013 13:09:33 +0000 (14:09 +0100)]
cos_tablegen: fix the lack on M_PI

We dont include mathematics.h as the headers get configured by config.h
for the target not the host.

Reviewed-by: Clément Bœsch <ubitux@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoalsdec: Introduce failsafe switch to keep ALSSpecificConfig consistent to the input.
Thilo Borgmann [Sat, 5 Jan 2013 14:29:13 +0000 (15:29 +0100)]
alsdec: Introduce failsafe switch to keep ALSSpecificConfig consistent to the input.

Reveiwed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoalsdec: Consistently use a period at the end of error messages.
Thilo Borgmann [Sun, 6 Jan 2013 11:14:53 +0000 (12:14 +0100)]
alsdec: Consistently use a period at the end of error messages.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agov210x: return meaningful error codes.
Anton Khirnov [Sat, 17 Nov 2012 14:34:17 +0000 (15:34 +0100)]
v210x: return meaningful error codes.

7 years agovb: return meaningful error codes.
Anton Khirnov [Sat, 17 Nov 2012 14:17:34 +0000 (15:17 +0100)]
vb: return meaningful error codes.

7 years agoindeo2: check decoding errors.
Anton Khirnov [Sat, 17 Nov 2012 07:08:40 +0000 (08:08 +0100)]
indeo2: check decoding errors.