ffmpeg.git
6 years agoWAV muxer: add RF64 support
Daniel Verkamp [Wed, 23 Jan 2013 08:30:23 +0000 (01:30 -0700)]
WAV muxer: add RF64 support

6 years agolavc/tta: Add support for encrypted streams
James Almer [Wed, 30 Jan 2013 03:35:26 +0000 (00:35 -0300)]
lavc/tta: Add support for encrypted streams

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 12 Feb 2013 13:10:36 +0000 (14:10 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavu: avoid clashing definition of E
  doc: developer: Add a note about reserved system name space

Conflicts:
libavutil/internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '56dea32f09e71460add14a1b6d0fbe6eb16f02a4'
Michael Niedermayer [Tue, 12 Feb 2013 12:41:24 +0000 (13:41 +0100)]
Merge commit '56dea32f09e71460add14a1b6d0fbe6eb16f02a4'

* commit '56dea32f09e71460add14a1b6d0fbe6eb16f02a4':
  doc: developer: Fix wording in "naming conventions" section
  openbsd: Add minor number to shared library install name

Conflicts:
doc/developer.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '304b806cb524fb040f8e09a241040f1af2cb820b'
Michael Niedermayer [Tue, 12 Feb 2013 12:26:15 +0000 (13:26 +0100)]
Merge commit '304b806cb524fb040f8e09a241040f1af2cb820b'

* commit '304b806cb524fb040f8e09a241040f1af2cb820b':
  build: Make library minor version visible in the Makefile
  x86: mpeg4qpel: Make movsxifnidn do the right thing

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '4c51fe48ba6dde059360b7451db7f6bbf2f11db3'
Michael Niedermayer [Tue, 12 Feb 2013 12:13:36 +0000 (13:13 +0100)]
Merge commit '4c51fe48ba6dde059360b7451db7f6bbf2f11db3'

* commit '4c51fe48ba6dde059360b7451db7f6bbf2f11db3':
  h264: Copy h264chroma dsp context to slice thread copies
  swscale: Disallow conversion to GBRP16

Conflicts:
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>
6 years agoMerge commit '62a43d30cc3b9b2460f2c926beb522df32493625'
Michael Niedermayer [Tue, 12 Feb 2013 11:58:10 +0000 (12:58 +0100)]
Merge commit '62a43d30cc3b9b2460f2c926beb522df32493625'

* commit '62a43d30cc3b9b2460f2c926beb522df32493625':
  crc: Move static data table from header to .c file
  avcodec/rectangle: Remove nonsense assert

Conflicts:
libavcodec/rectangle.h
libavutil/crc_data.h

The assert is not removed as the assert ensures clear and easy
to debug failures instead of undefined behavior in case of
misalignment.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '375ef6528c9dd2db7f9881e232cb0ec3aa16970d'
Michael Niedermayer [Tue, 12 Feb 2013 11:40:57 +0000 (12:40 +0100)]
Merge commit '375ef6528c9dd2db7f9881e232cb0ec3aa16970d'

* commit '375ef6528c9dd2db7f9881e232cb0ec3aa16970d':
  libfdk-aacenc: Actually check for upper bounds of cutoff
  arm: Fall back to runtime cpu feature detection via /proc/cpuinfo

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavu: avoid clashing definition of E
Luca Barbato [Sat, 9 Feb 2013 21:37:07 +0000 (22:37 +0100)]
lavu: avoid clashing definition of E

E is usually defined as a shorthand for AV_OPT_FLAG_ENCODING_PARAM.
Rename the single expansion E(x) now used in libavutil to E1.

6 years agoAdd add_pixels4/8() to h264dsp, and remove add_pixels4 from dsputil.
Ronald S. Bultje [Tue, 12 Feb 2013 01:04:27 +0000 (17:04 -0800)]
Add add_pixels4/8() to h264dsp, and remove add_pixels4 from dsputil.

These functions are mostly H264-specific (the only other user I can
spot is bink), and this allows us to special-case some functionality
for H264. Also remove the 16-bit-coeff with >8bpp versions (unused)
and merge the duplicate 32-bit-coeff for >8bpp (identical).

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosanm: Use the correct height variable in the decoded_size checks
Michael Niedermayer [Tue, 12 Feb 2013 01:03:28 +0000 (02:03 +0100)]
sanm: Use the correct height variable in the decoded_size checks

Fixes integer overflow and out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosanm: init sizes with the full frame size
Michael Niedermayer [Tue, 12 Feb 2013 01:00:04 +0000 (02:00 +0100)]
sanm: init sizes with the full frame size

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosanm: reset frame sizes on buffer destruction
Michael Niedermayer [Tue, 12 Feb 2013 00:59:07 +0000 (01:59 +0100)]
sanm: reset frame sizes on buffer destruction

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosanm: add forgotten check for decoded_size in old_codec37()
Michael Niedermayer [Tue, 12 Feb 2013 00:09:03 +0000 (01:09 +0100)]
sanm: add forgotten check for decoded_size in old_codec37()

Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: fix streamcopy of lsf mp3.
Michael Niedermayer [Mon, 11 Feb 2013 23:32:16 +0000 (00:32 +0100)]
ffmpeg: fix streamcopy of lsf mp3.

Fixes streamcopy of bear_mpeg4_mp3.avi
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/filters: rework idet filter description
Stefano Sabatini [Mon, 11 Feb 2013 22:40:41 +0000 (23:40 +0100)]
doc/filters: rework idet filter description

6 years agodoc/filters: apply minor fixes to il filter docs
Stefano Sabatini [Mon, 11 Feb 2013 22:38:47 +0000 (23:38 +0100)]
doc/filters: apply minor fixes to il filter docs

6 years agodoc/filters: fix position of il filter docs
Stefano Sabatini [Mon, 11 Feb 2013 22:37:53 +0000 (23:37 +0100)]
doc/filters: fix position of il filter docs

6 years agoUse simple nop codes for <= sse (rather than <= mmx).
Ronald S. Bultje [Tue, 29 Jan 2013 23:55:19 +0000 (15:55 -0800)]
Use simple nop codes for <= sse (rather than <= mmx).

The "CPU: CentaurHauls family 6 model 9 stepping 8" family of CPUs
(flags: fpu vme de pse tsc msr cx8 sep mtrr pge mov pat mmx fxsr sse
up rng rng_en ace ace_en) SIGILLs on long nop codes.

Change-Id: I7e7c52a2191006df30a9aadbc40d481a1db89106

6 years agoh264chroma: remove duplicate 9/10 bit functions.
Ronald S. Bultje [Mon, 11 Feb 2013 21:52:38 +0000 (13:52 -0800)]
h264chroma: remove duplicate 9/10 bit functions.

Also use the resulting 16bpp functions for anything >8 and <=16, not just
9 and 10. This fixes 12 and 14bpp H264 support.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc: developer: Fix wording in "naming conventions" section
Diego Biurrun [Mon, 11 Feb 2013 17:39:12 +0000 (18:39 +0100)]
doc: developer: Fix wording in "naming conventions" section

6 years agobuild: Make library minor version visible in the Makefile
Diego Biurrun [Sun, 3 Feb 2013 14:03:08 +0000 (15:03 +0100)]
build: Make library minor version visible in the Makefile

This allows employing that number in library install commands.

6 years agodoc: developer: Add a note about reserved system name space
Diego Biurrun [Mon, 11 Feb 2013 17:53:33 +0000 (18:53 +0100)]
doc: developer: Add a note about reserved system name space

6 years agoopenbsd: Add minor number to shared library install name
Diego Biurrun [Sun, 3 Feb 2013 14:02:31 +0000 (15:02 +0100)]
openbsd: Add minor number to shared library install name

This is what the OpenBSD porter's manual describes as correct, cf.
http://www.openbsd.org/faq/ports/specialtopics.html#SharedLibs

6 years agox86: mpeg4qpel: Make movsxifnidn do the right thing
Daniel Kang [Mon, 11 Feb 2013 18:45:10 +0000 (13:45 -0500)]
x86: mpeg4qpel: Make movsxifnidn do the right thing

Fixes an instruction that does nothing by changing the
source to dword.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agoh264: Copy h264chroma dsp context to slice thread copies
Martin Storsjö [Mon, 11 Feb 2013 18:27:50 +0000 (20:27 +0200)]
h264: Copy h264chroma dsp context to slice thread copies

This fixes slice threading which seems to have been broken since
79dad2a93.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoffv1enc: better heuristic to calculate initial states
Michael Niedermayer [Mon, 4 Feb 2013 16:33:07 +0000 (17:33 +0100)]
ffv1enc: better heuristic to calculate initial states

Slightly improves compression of 2pass files

Tested-by: "Peter B." <pb@das-werkstatt.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswscale: Disallow conversion to GBRP16
Martin Storsjö [Mon, 11 Feb 2013 11:37:29 +0000 (13:37 +0200)]
swscale: Disallow conversion to GBRP16

This reverts parts of d6d5ef5534d582, that didn't work right. (The
tests that were added failed on big endian, and the output looked
garbled on little endian as well.)

This is due to the fact that the intermediate scaling values (from
e.g. hScale8To19_c or hScale16To19_c) are stored as int32_t and
thus requires a separate output function, while yuv2gbrp_full_X_c
only interprets it as int16_t.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agocrc: Move static data table from header to .c file
Diego Biurrun [Sun, 3 Feb 2013 14:43:47 +0000 (15:43 +0100)]
crc: Move static data table from header to .c file

Having static data tables in header files is a potential source of trouble.

6 years agoavcodec/rectangle: Remove nonsense assert
Diego Biurrun [Fri, 8 Feb 2013 14:55:24 +0000 (15:55 +0100)]
avcodec/rectangle: Remove nonsense assert

6 years agolibfdk-aacenc: Actually check for upper bounds of cutoff
Derek Buitenhuis [Sat, 9 Feb 2013 19:03:02 +0000 (14:03 -0500)]
libfdk-aacenc: Actually check for upper bounds of cutoff

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agolibfdk-aacenc: Actually check for upper bounds of cutoff
Derek Buitenhuis [Sat, 9 Feb 2013 19:03:02 +0000 (14:03 -0500)]
libfdk-aacenc: Actually check for upper bounds of cutoff

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoarm: Fall back to runtime cpu feature detection via /proc/cpuinfo
Martin Storsjö [Thu, 7 Feb 2013 08:54:20 +0000 (10:54 +0200)]
arm: Fall back to runtime cpu feature detection via /proc/cpuinfo

On recent android versions, /proc/self/auxw is unreadable
(unless the process is running running under the shell uid or
in debuggable mode, which makes it hard to notice). See
http://b.android.com/43055 and
https://android-review.googlesource.com/51271 for more information
about the issue.

This makes sure e.g. neon optimizations are enabled at runtime in
android apps even when built in release mode, if configured to
use the runtime detection.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agolavfi/amerge: make description consistent with documentation
Paul B Mahol [Mon, 11 Feb 2013 12:47:02 +0000 (12:47 +0000)]
lavfi/amerge: make description consistent with documentation

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoPrint mxf Universal Label if the user requested verbose logging.
Carl Eugen Hoyos [Mon, 11 Feb 2013 12:11:16 +0000 (13:11 +0100)]
Print mxf Universal Label if the user requested verbose logging.

Fixes ticket #2198

6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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

6 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

6 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.

6 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.

6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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().

6 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

6 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>
6 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.

6 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
6 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>
6 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>
6 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.

6 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.

6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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.

6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 years agolavf: add tee pseudo-muxer.
Nicolas George [Sat, 9 Feb 2013 19:50:11 +0000 (20:50 +0100)]
lavf: add tee pseudo-muxer.

6 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>
6 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>
6 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>
6 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>
6 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>
6 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

6 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>
6 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>
6 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>
6 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>
6 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>
6 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.

6 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>
6 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
6 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)".

6 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>
6 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>
6 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>
6 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.

6 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

6 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