ffmpeg.git
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 11 Feb 2013 11:15:54 +0000 (12:15 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  sparc: dsputil_vis: Fix silly variable name search and replace typo

Conflicts:
libavcodec/sparc/dsputil_vis.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoevrcdec: fix wrong condition
Paul B Mahol [Mon, 11 Feb 2013 11:04:52 +0000 (11:04 +0000)]
evrcdec: fix wrong condition

Fixes CID980005 and CID980004.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoget_bits: return pointer to buffer that is the result of the alignment.
Ronald S. Bultje [Mon, 11 Feb 2013 00:46:07 +0000 (16:46 -0800)]
get_bits: return pointer to buffer that is the result of the alignment.

This allows more transparent mixing of get_bits and whole-byte access
without having to touch get_bits internals.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agobit_depth_template: don't depend on dsputil.h.
Ronald S. Bultje [Sun, 10 Feb 2013 23:59:22 +0000 (15:59 -0800)]
bit_depth_template: don't depend on dsputil.h.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMove ff_emulated_edge_mc prototypes to videodsp.
Ronald S. Bultje [Sun, 10 Feb 2013 23:59:21 +0000 (15:59 -0800)]
Move ff_emulated_edge_mc prototypes to videodsp.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264 intra pred: add missing includes.
Ronald S. Bultje [Sun, 10 Feb 2013 23:59:20 +0000 (15:59 -0800)]
h264 intra pred: add missing includes.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomlpdec: check ch_assign more completely
Michael Niedermayer [Sun, 10 Feb 2013 23:42:58 +0000 (00:42 +0100)]
mlpdec: check ch_assign more completely

Fixes CID970924

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosparc: dsputil_vis: Fix silly variable name search and replace typo
Diego Biurrun [Sun, 10 Feb 2013 21:03:48 +0000 (22:03 +0100)]
sparc: dsputil_vis: Fix silly variable name search and replace typo

7 years agolavfi/il: filter out hwaccels formats from the list of supported formats
Stefano Sabatini [Sun, 10 Feb 2013 19:57:44 +0000 (20:57 +0100)]
lavfi/il: filter out hwaccels formats from the list of supported formats

7 years agolavf/matroskaenc: provide more feedback in case of unsupported codec
Stefano Sabatini [Sun, 10 Feb 2013 17:02:59 +0000 (18:02 +0100)]
lavf/matroskaenc: provide more feedback in case of unsupported codec

Also return meaningful error code.

7 years agolavd/v4l2: fix error logic when enumerating standards
Stefano Sabatini [Sun, 10 Feb 2013 16:46:17 +0000 (17:46 +0100)]
lavd/v4l2: fix error logic when enumerating standards

Set ret to 0 before enumerating standards in v4l2_set_parameters(), avoid
use of uninitialized variable.

Regression introduced in 60950adc18fe145a235211e75da68ab07123fcaa.

7 years agotiff: dont leave geotag_count in an invalid state on errors.
Michael Niedermayer [Sun, 10 Feb 2013 19:24:22 +0000 (20:24 +0100)]
tiff: dont leave geotag_count in an invalid state on errors.

Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agotiff: check for failure in search_keyval()
Michael Niedermayer [Sun, 10 Feb 2013 19:17:33 +0000 (20:17 +0100)]
tiff: check for failure in search_keyval()

Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agopictordec: fix cga palette index limit
Michael Niedermayer [Sun, 10 Feb 2013 17:31:05 +0000 (18:31 +0100)]
pictordec: fix cga palette index limit

Fixes out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoFix division by 0 due to audio frame size
Michael Niedermayer [Sun, 10 Feb 2013 17:15:33 +0000 (18:15 +0100)]
Fix division by 0 due to audio frame size

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodpx: include offset in the total_size calculation
Michael Niedermayer [Sun, 10 Feb 2013 16:54:00 +0000 (17:54 +0100)]
dpx: include offset in the  total_size calculation

Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodpx: Fix rounding in 10bit total_size calculation
Michael Niedermayer [Sun, 10 Feb 2013 16:50:56 +0000 (17:50 +0100)]
dpx: Fix rounding in 10bit total_size calculation

This could have caused out of array reads

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agopcx: Add missing padding to scanline buffer
Michael Niedermayer [Sun, 10 Feb 2013 16:19:35 +0000 (17:19 +0100)]
pcx: Add missing padding to scanline buffer

Fixes out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agopcx: use init_get_bits8()
Michael Niedermayer [Sun, 10 Feb 2013 16:19:15 +0000 (17:19 +0100)]
pcx: use init_get_bits8()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavd/v4l2: implement consistent error handling
Stefano Sabatini [Sun, 10 Feb 2013 11:14:40 +0000 (12:14 +0100)]
lavd/v4l2: implement consistent error handling

In particular, avoid use of non-thread-safe strerror(), and store errno
before calling av_log().

7 years agotests: add fate-lavfi-il test
Stefano Sabatini [Sun, 10 Feb 2013 11:44:14 +0000 (12:44 +0100)]
tests: add fate-lavfi-il test

7 years agopcx: fix rounding in bytes_per_scanline check
Michael Niedermayer [Sun, 10 Feb 2013 15:52:04 +0000 (16:52 +0100)]
pcx: fix rounding in bytes_per_scanline check

Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoSupport more atrac3-in-mkv samples.
Carl Eugen Hoyos [Sun, 10 Feb 2013 13:41:55 +0000 (14:41 +0100)]
Support more atrac3-in-mkv samples.

The mkv demuxer sometimes finds 12 bytes of realmedia
extradata after the matroska real audio properties.

7 years agoRevert "Merge commit 'db0a943266be29ff0596872ebb418dfed75d00de'"
Michael Niedermayer [Sun, 10 Feb 2013 13:27:57 +0000 (14:27 +0100)]
Revert "Merge commit 'db0a943266be29ff0596872ebb418dfed75d00de'"

This reverts commit d80820655362645ae1c65d457287d7d12c04a44f, reversing
changes made to 30085bd43e35acf931429dc445db5bc1869be022.

This is not needed

Requested-by: Marton Balint
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 10 Feb 2013 13:17:06 +0000 (14:17 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  sws: disable yuv2rgb warning for planar rgb.

Conflicts:
libswscale/yuv2rgb.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '7b41c24c5fa221b55a9302efaf1a9eeb38b12551'
Michael Niedermayer [Sun, 10 Feb 2013 13:07:27 +0000 (14:07 +0100)]
Merge commit '7b41c24c5fa221b55a9302efaf1a9eeb38b12551'

* commit '7b41c24c5fa221b55a9302efaf1a9eeb38b12551':
  sws: dont enable chrSrcHSubSample for planar RGB

Conflicts:
libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/il: move query_formats() definition up
Stefano Sabatini [Sun, 10 Feb 2013 00:21:12 +0000 (01:21 +0100)]
lavfi/il: move query_formats() definition up

Respect order of call during the filter lifecycle, improve readability.

7 years agolavfi/il: simplify/generalize linesize computation
Stefano Sabatini [Sun, 10 Feb 2013 00:15:47 +0000 (01:15 +0100)]
lavfi/il: simplify/generalize linesize computation

Rely on generic utilities for computing each plane linesize.

In particular, add support to NV12/21 formats and avoid use of
PIX_FMT_PLANAR pixdesc flag, whose semantics is questionable.

It also fixes various crashes.

7 years agoMerge commit 'e58013dd8f00e17dd98ba64e41c72f1d152f6608'
Michael Niedermayer [Sun, 10 Feb 2013 12:55:51 +0000 (13:55 +0100)]
Merge commit 'e58013dd8f00e17dd98ba64e41c72f1d152f6608'

* commit 'e58013dd8f00e17dd98ba64e41c72f1d152f6608':
  sws: use planarRgbToRgbWrapper only for 8bit per component

Conflicts:
libswscale/swscale_unscaled.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'd6d5ef5534d582f9dbaf18ac2605cf5bb72cd821'
Michael Niedermayer [Sun, 10 Feb 2013 12:48:21 +0000 (13:48 +0100)]
Merge commit 'd6d5ef5534d582f9dbaf18ac2605cf5bb72cd821'

* commit 'd6d5ef5534d582f9dbaf18ac2605cf5bb72cd821':
  sws: GBRP9, GBRP10, and GBRP16 output support

Conflicts:
libswscale/output.c
libswscale/utils.c
tests/ref/lavfi/pixdesc
tests/ref/lavfi/pixfmts_copy
tests/ref/lavfi/pixfmts_null
tests/ref/lavfi/pixfmts_scale
tests/ref/lavfi/pixfmts_vflip

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '81726a4f0b8a43e19898e2a36fdde80583bafff0'
Michael Niedermayer [Sun, 10 Feb 2013 12:17:58 +0000 (13:17 +0100)]
Merge commit '81726a4f0b8a43e19898e2a36fdde80583bafff0'

* commit '81726a4f0b8a43e19898e2a36fdde80583bafff0':
  FATE: add tests for additional flavors of asf cover art
  asfdec: do not assume every AVStream has a corresponding ASFStream

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'f5fac6f77752931347ab302563802dcaa49c2419'
Michael Niedermayer [Sun, 10 Feb 2013 12:06:16 +0000 (13:06 +0100)]
Merge commit 'f5fac6f77752931347ab302563802dcaa49c2419'

* commit 'f5fac6f77752931347ab302563802dcaa49c2419':
  asfdec: support reading ID3v2 tags in ASF files

Conflicts:
Changelog
libavformat/asfdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'db0a943266be29ff0596872ebb418dfed75d00de'
Michael Niedermayer [Sun, 10 Feb 2013 11:47:02 +0000 (12:47 +0100)]
Merge commit 'db0a943266be29ff0596872ebb418dfed75d00de'

* commit 'db0a943266be29ff0596872ebb418dfed75d00de':
  avplay: apply the stream sample_aspect_ratio to decoded video frames

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '84b721db366c0734fdfd23c8daaa7da7da21f761'
Michael Niedermayer [Sun, 10 Feb 2013 11:39:12 +0000 (12:39 +0100)]
Merge commit '84b721db366c0734fdfd23c8daaa7da7da21f761'

* commit '84b721db366c0734fdfd23c8daaa7da7da21f761':
  asfdec: also read Metadata Library Object

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '61f9ad2dfcb3f98b7ac5777d19d0e7b61d0be01e'
Michael Niedermayer [Sun, 10 Feb 2013 11:18:50 +0000 (12:18 +0100)]
Merge commit '61f9ad2dfcb3f98b7ac5777d19d0e7b61d0be01e'

* commit '61f9ad2dfcb3f98b7ac5777d19d0e7b61d0be01e':
  asfdec: read the full Metadata Object, not just aspect ratio information

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '36fab50e90d15352e403e4cc210890810f2fb4e2'
Michael Niedermayer [Sun, 10 Feb 2013 11:14:08 +0000 (12:14 +0100)]
Merge commit '36fab50e90d15352e403e4cc210890810f2fb4e2'

* commit '36fab50e90d15352e403e4cc210890810f2fb4e2':
  asfdec: silence a warning
  mss4, ra288: Remove unused DSPContext local codec context members

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoDo not write invalid matroska files.
Carl Eugen Hoyos [Sun, 10 Feb 2013 09:51:12 +0000 (10:51 +0100)]
Do not write invalid matroska files.

Some real codecs are supported by the matroska specification
(and FFmpeg's matroska demuxer) but not the FFmpeg muxer.

7 years agoimgconvert: use get_pix_fmt_score in avcodec_find_best_pix_fmt_of_2()
Michael Niedermayer [Sun, 10 Feb 2013 00:19:25 +0000 (01:19 +0100)]
imgconvert: use get_pix_fmt_score in avcodec_find_best_pix_fmt_of_2()

This fixes various poorly choosen pixel format cases.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoimgconvert: add get_pix_fmt_score()
Michael Niedermayer [Sun, 10 Feb 2013 00:04:57 +0000 (01:04 +0100)]
imgconvert: add get_pix_fmt_score()

get_pix_fmt_score() returns a score representing the amount
of loss when converting a pixel format

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/il: fix typo in Copyright
Paul B Mahol [Sat, 9 Feb 2013 21:56:04 +0000 (21:56 +0000)]
lavfi/il: fix typo in Copyright

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolavfi: remove mp=il filter
Paul B Mahol [Sat, 9 Feb 2013 21:01:54 +0000 (21:01 +0000)]
lavfi: remove mp=il filter

Native il video filter is now available.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolavfi: port MP il filter
Paul B Mahol [Fri, 8 Feb 2013 15:48:59 +0000 (15:48 +0000)]
lavfi: port MP il filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agotarga: Fix y check in advance_line
Michael Niedermayer [Sat, 9 Feb 2013 19:49:32 +0000 (20:49 +0100)]
targa: Fix y check in advance_line

Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf: add tee pseudo-muxer.
Nicolas George [Sat, 9 Feb 2013 19:50:11 +0000 (20:50 +0100)]
lavf: add tee pseudo-muxer.

7 years agosws: disable yuv2rgb warning for planar rgb.
Michael Niedermayer [Sat, 26 Jan 2013 22:05:26 +0000 (23:05 +0100)]
sws: disable yuv2rgb warning for planar rgb.

planar rgb formats do not use the table

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
7 years agorv10: remove check that is always true
Paul B Mahol [Sat, 9 Feb 2013 19:31:17 +0000 (19:31 +0000)]
rv10: remove check that is always true

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agosws: dont enable chrSrcHSubSample for planar RGB
Michael Niedermayer [Sat, 26 Jan 2013 18:49:22 +0000 (19:49 +0100)]
sws: dont enable chrSrcHSubSample for planar RGB

This code path is not implemented and makes not much sense to implement
either.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
7 years agosws: use planarRgbToRgbWrapper only for 8bit per component
Michael Niedermayer [Sat, 26 Jan 2013 18:43:06 +0000 (19:43 +0100)]
sws: use planarRgbToRgbWrapper only for 8bit per component

The function doesnt support >8bit currently

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
7 years agosws: GBRP9, GBRP10, and GBRP16 output support
Michael Niedermayer [Fri, 25 Jan 2013 22:05:48 +0000 (23:05 +0100)]
sws: GBRP9, GBRP10, and GBRP16 output support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
7 years agoFATE: add tests for additional flavors of asf cover art
Anton Khirnov [Fri, 8 Feb 2013 13:00:28 +0000 (14:00 +0100)]
FATE: add tests for additional flavors of asf cover art

7 years agoasfdec: support reading ID3v2 tags in ASF files
Vladimir Pantelic [Fri, 8 Feb 2013 10:06:37 +0000 (11:06 +0100)]
asfdec: support reading ID3v2 tags in ASF files

Yes, these files do exist

Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agoavplay: apply the stream sample_aspect_ratio to decoded video frames
Vladimir Pantelic [Thu, 7 Feb 2013 17:42:39 +0000 (18:42 +0100)]
avplay: apply the stream sample_aspect_ratio to decoded video frames

If there is a sample_aspect_ratio in the stream, then apply it to every
decoded frame in the same way as avconv does. This also makes sure that
the avfilter chain has access to the aspect ratio.

Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agoasfdec: also read Metadata Library Object
Vladimir Pantelic [Wed, 6 Feb 2013 13:35:27 +0000 (14:35 +0100)]
asfdec: also read Metadata Library Object

In some ASF files this objects holds cover art and other tags. Compared to
Metadata Object it can also hold GUIDs, but we ignore these for now.

Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agoasfdec: read the full Metadata Object, not just aspect ratio information
Vladimir Pantelic [Wed, 6 Feb 2013 13:35:26 +0000 (14:35 +0100)]
asfdec: read the full Metadata Object, not just aspect ratio information

Use the same get_tag()/get_value() as for the Extended Content Description
but handle the 16 bit vs 32 bit difference for type 2 (BOOL)

Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agoasfdec: silence a warning
Vladimir Pantelic [Wed, 6 Feb 2013 13:35:25 +0000 (14:35 +0100)]
asfdec: silence a warning

Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agoasfdec: do not assume every AVStream has a corresponding ASFStream
Anton Khirnov [Fri, 8 Feb 2013 12:54:36 +0000 (13:54 +0100)]
asfdec: do not assume every AVStream has a corresponding ASFStream

This won't be true for ID3 attached picture.

Also stop allocating now useless dummy ASFStreams for ASF native
attached pictures.

7 years agomotionpixels: Check that the vlc table has been fully inited
Michael Niedermayer [Sat, 9 Feb 2013 17:40:12 +0000 (18:40 +0100)]
motionpixels: Check that the vlc table has been fully inited

Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomotionpixels: Propagate errors in vlc table init
Michael Niedermayer [Sat, 9 Feb 2013 17:37:53 +0000 (18:37 +0100)]
motionpixels: Propagate errors in vlc table init

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
7 years agoCall the common 7.1 wide channel layout "7.1(wide)".
Carl Eugen Hoyos [Sat, 9 Feb 2013 17:14:46 +0000 (18:14 +0100)]
Call the common 7.1 wide channel layout "7.1(wide)".

Rename the uncommon variant with side speakers to "7.1(wide-side)".

7 years agolavu/internal: rename macro E(x) to EXPAND(x)
Paul B Mahol [Sat, 9 Feb 2013 14:02:13 +0000 (14:02 +0000)]
lavu/internal: rename macro E(x) to EXPAND(x)

Fixes bunch of warnings of E redefinition under clang.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolavfi/histogram: make waveform mode more useful
Paul B Mahol [Sat, 9 Feb 2013 16:05:28 +0000 (16:05 +0000)]
lavfi/histogram: make waveform mode more useful

Now it displays all color components (not just luma)
either in parade or overlay and also works with RGB colorspace.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agopaf, sanm: remove unused header after b05830169d
Paul B Mahol [Sat, 9 Feb 2013 14:16:53 +0000 (14:16 +0000)]
paf, sanm: remove unused header after b05830169d

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoFix libpostproc compilation on x86_32 with disable-optimizations.
Carl Eugen Hoyos [Sat, 9 Feb 2013 14:01:51 +0000 (15:01 +0100)]
Fix libpostproc compilation on x86_32 with disable-optimizations.

7 years agodoc/filters: end table in histogram docs
Stefano Sabatini [Sat, 9 Feb 2013 13:49:47 +0000 (14:49 +0100)]
doc/filters: end table in histogram docs

7 years agodoc/demuxers: add docs for rawvideo demuxer
Stefano Sabatini [Fri, 8 Feb 2013 23:58:35 +0000 (00:58 +0100)]
doc/demuxers: add docs for rawvideo demuxer

7 years agolavf/rawvideodec: fix/extend option descriptions
Stefano Sabatini [Fri, 8 Feb 2013 23:58:19 +0000 (00:58 +0100)]
lavf/rawvideodec: fix/extend option descriptions

7 years agodoc/demuxers: fix copy&paste error in "@c man end" line
Stefano Sabatini [Fri, 8 Feb 2013 23:45:51 +0000 (00:45 +0100)]
doc/demuxers: fix copy&paste error in "@c man end" line

Use proper name for ending chapter.

7 years agodoc/demuxers: sort demuxers by name
Stefano Sabatini [Fri, 8 Feb 2013 23:45:05 +0000 (00:45 +0100)]
doc/demuxers: sort demuxers by name

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 9 Feb 2013 13:42:06 +0000 (14:42 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dsputil: Move fdct function declarations to dct.h

Conflicts:
libavcodec/dsputil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '218aefce4472dc02ee3f12830a9a894bf7916da9'
Michael Niedermayer [Sat, 9 Feb 2013 13:33:57 +0000 (14:33 +0100)]
Merge commit '218aefce4472dc02ee3f12830a9a894bf7916da9'

* commit '218aefce4472dc02ee3f12830a9a894bf7916da9':
  dsputil: Move LOCAL_ALIGNED macros to libavutil

Conflicts:
libavcodec/dvdec.c
libavcodec/imc.c
libavcodec/mpegvideo_motion.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomss4, ra288: Remove unused DSPContext local codec context members
Diego Biurrun [Fri, 8 Feb 2013 23:09:54 +0000 (00:09 +0100)]
mss4, ra288: Remove unused DSPContext local codec context members

7 years agoMerge commit '059866eb17cd3c66422a61d3e9c3305f55830a50'
Michael Niedermayer [Sat, 9 Feb 2013 13:27:39 +0000 (14:27 +0100)]
Merge commit '059866eb17cd3c66422a61d3e9c3305f55830a50'

* commit '059866eb17cd3c66422a61d3e9c3305f55830a50':
  dsputil: Move WRAPPER8_16_SQ macro to the only place it is used

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agornd_avg: fix author attribution
Michael Niedermayer [Sat, 9 Feb 2013 13:18:14 +0000 (14:18 +0100)]
rnd_avg: fix author attribution

Reference:
commit 41fda91d097b85542981a4779e36f8eefda7ee69
Author: BERO <bero@geocities.co.jp>
Date:   Wed May 14 17:46:55 2003 +0000

    aligned dsputil (for sh4) patch by (BERO <bero at geocities dot co dot jp>)

    Originally committed as revision 1880 to svn://svn.ffmpeg.org/ffmpeg/trunk

commit 8dbe5856410ee10ac4a9368105149efdacfac994
Author: Oskar Arvidsson <oskar@irock.se>
Date:   Tue Mar 29 17:48:59 2011 +0200

    Adds 8-, 9- and 10-bit versions of some of the functions used by the h264 decoder.

    This patch lets e.g. dsputil_init chose dsp functions with respect to
    the bit depth to decode. The naming scheme of bit depth dependent
    functions is <base name>_<bit depth>[_<prefix>] (i.e. the old
    clear_blocks_c is now named clear_blocks_8_c).

    Note: Some of the functions for high bit depth is not dependent on the
    bit depth, but only on the pixel size. This leaves some room for
    optimizing binary size.

    Preparatory patch for high bit depth h264 decoding support.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'bf6b3ec924b4fb64d14df33077f4d4541d525dbf'
Michael Niedermayer [Sat, 9 Feb 2013 13:01:40 +0000 (14:01 +0100)]
Merge commit 'bf6b3ec924b4fb64d14df33077f4d4541d525dbf'

* commit 'bf6b3ec924b4fb64d14df33077f4d4541d525dbf':
  dsputil: Move rnd_avg inline functions to a separate header

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'b9c2408b19dc9408e9dc0ce4a099af529bbfba3b'
Michael Niedermayer [Sat, 9 Feb 2013 12:51:43 +0000 (13:51 +0100)]
Merge commit 'b9c2408b19dc9408e9dc0ce4a099af529bbfba3b'

* commit 'b9c2408b19dc9408e9dc0ce4a099af529bbfba3b':
  dsputil: Remove commented-out, unused function declarations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '35685a3c2a1ec09f3c62dcfc4368fe9e92bcddf6'
Michael Niedermayer [Sat, 9 Feb 2013 12:44:55 +0000 (13:44 +0100)]
Merge commit '35685a3c2a1ec09f3c62dcfc4368fe9e92bcddf6'

* commit '35685a3c2a1ec09f3c62dcfc4368fe9e92bcddf6':
  dsputil: Move ff_shrink* function declarations to separate header
  dsputil: Move ff_svq3 function declarations to a separate header

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '6a4430407404bfe55581e66a86a496c9adf6fb44'
Michael Niedermayer [Sat, 9 Feb 2013 12:40:03 +0000 (13:40 +0100)]
Merge commit '6a4430407404bfe55581e66a86a496c9adf6fb44'

* commit '6a4430407404bfe55581e66a86a496c9adf6fb44':
  dsputil: Move ff_h264_idct function declarations to a separate header

Conflicts:
libavcodec/dsputil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/histogram: make it C90 compliant
Paul B Mahol [Sat, 9 Feb 2013 12:25:55 +0000 (12:25 +0000)]
lavfi/histogram: make it C90 compliant

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoMerge commit 'b9ba5253dd1232be4b48cfe61c31ff4b3de3d10a'
Michael Niedermayer [Sat, 9 Feb 2013 12:16:57 +0000 (13:16 +0100)]
Merge commit 'b9ba5253dd1232be4b48cfe61c31ff4b3de3d10a'

* commit 'b9ba5253dd1232be4b48cfe61c31ff4b3de3d10a':
  dsputil: Move copy_block functions to a separate header
  dsputil: Drop unused functions copy_block{2|4|16}

No functions are droped because they are used in several places.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agohistogram filter
Paul B Mahol [Fri, 21 Dec 2012 18:50:13 +0000 (18:50 +0000)]
histogram filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoMerge commit 'b9ee5f2cab3ffe1c962e542346b1ed61394864ec'
Michael Niedermayer [Sat, 9 Feb 2013 11:19:21 +0000 (12:19 +0100)]
Merge commit 'b9ee5f2cab3ffe1c962e542346b1ed61394864ec'

* commit 'b9ee5f2cab3ffe1c962e542346b1ed61394864ec':
  indeo3: replace use of copy_block4 with put_pixels
  mjpegdec: use put_pixels instead of copy_block8

Conflicts:
libavcodec/mjpegdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'b5b7b75e91e291c810ebd01868a42b53f267a87c'
Michael Niedermayer [Sat, 9 Feb 2013 11:05:53 +0000 (12:05 +0100)]
Merge commit 'b5b7b75e91e291c810ebd01868a42b53f267a87c'

* commit 'b5b7b75e91e291c810ebd01868a42b53f267a87c':
  dsputil: Move get_penalty_factor() to the only place it is used.

Conflicts:
libavcodec/dsputil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '0b016eb99d38738e2c53e36549a4732a0f863b2e'
Michael Niedermayer [Sat, 9 Feb 2013 10:43:23 +0000 (11:43 +0100)]
Merge commit '0b016eb99d38738e2c53e36549a4732a0f863b2e'

* commit '0b016eb99d38738e2c53e36549a4732a0f863b2e':
  dsputil: Move ff_block_permute to mpegvideo_enc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'rdp/dshow_shared'
Michael Niedermayer [Sat, 9 Feb 2013 03:06:52 +0000 (04:06 +0100)]
Merge remote-tracking branch 'rdp/dshow_shared'

* rdp/dshow_shared:
  dshow: attempt to build shared as well as static

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosparc: Revert some parameter name changes in dsputil_vis.c
James Almer [Sat, 9 Feb 2013 00:59:45 +0000 (21:59 -0300)]
sparc: Revert some parameter name changes in dsputil_vis.c

They were renamed by mistake in 25841df.
This should fix compilation failures on sparc.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoget_se_golomb: fix decoding of very large values
Michael Niedermayer [Fri, 8 Feb 2013 23:43:30 +0000 (00:43 +0100)]
get_se_golomb: fix decoding of very large values

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodsputil: Move fdct function declarations to dct.h
Diego Biurrun [Thu, 7 Feb 2013 20:58:48 +0000 (21:58 +0100)]
dsputil: Move fdct function declarations to dct.h

7 years agodsputil: Move LOCAL_ALIGNED macros to libavutil
Diego Biurrun [Thu, 7 Feb 2013 23:31:13 +0000 (00:31 +0100)]
dsputil: Move LOCAL_ALIGNED macros to libavutil

7 years agodsputil: Move WRAPPER8_16_SQ macro to the only place it is used
Diego Biurrun [Thu, 7 Feb 2013 21:39:26 +0000 (22:39 +0100)]
dsputil: Move WRAPPER8_16_SQ macro to the only place it is used

7 years agodsputil: Move rnd_avg inline functions to a separate header
Diego Biurrun [Thu, 7 Feb 2013 21:37:00 +0000 (22:37 +0100)]
dsputil: Move rnd_avg inline functions to a separate header

7 years agodsputil: Remove commented-out, unused function declarations
Diego Biurrun [Thu, 7 Feb 2013 21:18:07 +0000 (22:18 +0100)]
dsputil: Remove commented-out, unused function declarations

7 years agodsp: make put_no_rnd_pixels_tab 4x4 big
Michael Niedermayer [Fri, 8 Feb 2013 21:55:55 +0000 (22:55 +0100)]
dsp: make put_no_rnd_pixels_tab 4x4 big

This makes it match the other tables and fixes out of array acceses.

Fixes CID980012

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodxva2: Prevent redefinition of _WIN32_WINNT
James Almer [Fri, 8 Feb 2013 04:17:06 +0000 (01:17 -0300)]
dxva2: Prevent redefinition of _WIN32_WINNT

Don't redefine _WIN32_WINNT when targeting Win7/8

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoff_end_tag: assert that the start is aligned.
Michael Niedermayer [Fri, 8 Feb 2013 11:51:52 +0000 (12:51 +0100)]
ff_end_tag: assert that the start is aligned.

If its start is not aligned then aligning its end will
likely break many demuxers as they check the size and not
the position.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoriff: chunks must be at 2 byte boundary
Paul B Mahol [Thu, 7 Feb 2013 10:00:40 +0000 (10:00 +0000)]
riff: chunks must be at 2 byte boundary

Fixes #2244.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agovc1dec: Fix destination pointers in context for fields
Michael Niedermayer [Fri, 1 Feb 2013 18:58:26 +0000 (19:58 +0100)]
vc1dec: Fix destination pointers in context for fields

This replaces a large number of checks for the second field by
fixing the pointers when they are setup

This should also fix I/BI field pictures

Changes checksums for vc1_sa10143, the file becomes slightly closer
to what the reference decoder outputs

Based on "vc1dec: the second field is written wrong to the picture"
         by Sebastian Sandberg <sebastiand.sandberg@gmail.com>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodsputil: Move ff_shrink* function declarations to separate header
Diego Biurrun [Thu, 7 Feb 2013 20:43:58 +0000 (21:43 +0100)]
dsputil: Move ff_shrink* function declarations to separate header

7 years agodsputil: Move ff_h264_idct function declarations to a separate header
Diego Biurrun [Thu, 7 Feb 2013 20:25:55 +0000 (21:25 +0100)]
dsputil: Move ff_h264_idct function declarations to a separate header

7 years agodsputil: Move copy_block functions to a separate header
Diego Biurrun [Thu, 7 Feb 2013 21:03:49 +0000 (22:03 +0100)]
dsputil: Move copy_block functions to a separate header

7 years agoindeo3: replace use of copy_block4 with put_pixels
Mans Rullgard [Sun, 9 Dec 2012 19:18:47 +0000 (19:18 +0000)]
indeo3: replace use of copy_block4 with put_pixels

The destination is sufficiently aligned for put_pixels here.

Signed-off-by: Mans Rullgard <mans@mansr.com>