ffmpeg.git
5 years agoMerge remote-tracking branch 'lukaszmluki/master'
Michael Niedermayer [Sun, 20 Apr 2014 03:43:23 +0000 (05:43 +0200)]
Merge remote-tracking branch 'lukaszmluki/master'

* lukaszmluki/master:
  lavd/xv: implement repaint message
  lavd/xv: add window id param
  lavd/xv: keep aspect ratio

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/iff: extend IFF demuxer to decode DSDIFF 64-bit chunks
Peter Ross [Fri, 18 Apr 2014 06:00:15 +0000 (16:00 +1000)]
avformat/iff: extend IFF demuxer to decode DSDIFF 64-bit chunks

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '911fa05b514e1be009e00b79d7004b93717c023b'
Michael Niedermayer [Sat, 19 Apr 2014 20:43:16 +0000 (22:43 +0200)]
Merge commit '911fa05b514e1be009e00b79d7004b93717c023b'

* commit '911fa05b514e1be009e00b79d7004b93717c023b':
  mvc: Specify the pixel format for the mv-mvc* tests

Conflicts:
tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agomvc: Specify the pixel format for the mv-mvc* tests
Martin Storsjö [Sat, 19 Apr 2014 15:51:38 +0000 (18:51 +0300)]
mvc: Specify the pixel format for the mv-mvc* tests

Also set the RGBA pixel format correctly as the native endian format,
which is what it returns.

This fixes the tests on big endian.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoMerge commit '6dfd99c93808d6504dd5cb1fad847d68cb179352'
Michael Niedermayer [Sat, 19 Apr 2014 18:40:02 +0000 (20:40 +0200)]
Merge commit '6dfd99c93808d6504dd5cb1fad847d68cb179352'

* commit '6dfd99c93808d6504dd5cb1fad847d68cb179352':
  fate: add tests for SGI RLE and MVC1&2 decoders

Conflicts:
tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '55ddd700c67529ff2c6c4e976673f1341bba7a82'
Michael Niedermayer [Sat, 19 Apr 2014 18:15:27 +0000 (20:15 +0200)]
Merge commit '55ddd700c67529ff2c6c4e976673f1341bba7a82'

* commit '55ddd700c67529ff2c6c4e976673f1341bba7a82':
  Silicon Graphics Movie demuxer

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

See: 6fb40779cd3457a819e20d6db91a142c47cad3c2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '86a0432688216562926d4aee36118f01be6d5e1b'
Michael Niedermayer [Sat, 19 Apr 2014 17:47:18 +0000 (19:47 +0200)]
Merge commit '86a0432688216562926d4aee36118f01be6d5e1b'

* commit '86a0432688216562926d4aee36118f01be6d5e1b':
  Silicon Graphics Motion Video Compressor 1 & 2 decoder

Conflicts:
Changelog
libavcodec/avcodec.h
libavcodec/mvcdec.c
libavcodec/version.h

See: 746b1dcc98b466e4abd301f304127583722ad80b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '07761294fc3f08e139e8a406ef7d5b63aaf1ecee'
Michael Niedermayer [Sat, 19 Apr 2014 17:12:57 +0000 (19:12 +0200)]
Merge commit '07761294fc3f08e139e8a406ef7d5b63aaf1ecee'

* commit '07761294fc3f08e139e8a406ef7d5b63aaf1ecee':
  Silicon Graphics RLE 8-bit video decoder

Conflicts:
Changelog
doc/general.texi
libavcodec/avcodec.h
libavcodec/sgirledec.c
libavcodec/version.h

See: afa1617b937f3675f74c6351a46c45f8c24d67f2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '34c5a6660a9e5e3cf301691bb29d011638953dc2'
Michael Niedermayer [Sat, 19 Apr 2014 16:50:32 +0000 (18:50 +0200)]
Merge commit '34c5a6660a9e5e3cf301691bb29d011638953dc2'

* commit '34c5a6660a9e5e3cf301691bb29d011638953dc2':
  h264: codec reinit: remove statements without effect

Conflicts:
libavcodec/h264_slice.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6ef96292d99302a59f824713fc763f6abd3754df'
Michael Niedermayer [Sat, 19 Apr 2014 16:37:49 +0000 (18:37 +0200)]
Merge commit '6ef96292d99302a59f824713fc763f6abd3754df'

* commit '6ef96292d99302a59f824713fc763f6abd3754df':
  utils: add yvyu422 to avcodec_align_dimensions2

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd23fc8846d255e31896453136b4c77bc6d5e873f'
Michael Niedermayer [Sat, 19 Apr 2014 16:28:38 +0000 (18:28 +0200)]
Merge commit 'd23fc8846d255e31896453136b4c77bc6d5e873f'

* commit 'd23fc8846d255e31896453136b4c77bc6d5e873f':
  filtfmts: remove unused lavf include

A include for channel_layout.h, is added otherwise compile would break

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '58400ac133bcfb6bf8196b4e5208bc178307739b'
Michael Niedermayer [Sat, 19 Apr 2014 16:20:17 +0000 (18:20 +0200)]
Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b'

* commit '58400ac133bcfb6bf8196b4e5208bc178307739b':
  lavfi: name anonymous structs

Conflicts:
libavfilter/buffersink.c
libavfilter/f_select.c
libavfilter/src_movie.c
libavfilter/vf_drawbox.c
libavfilter/vf_drawtext.c
libavfilter/vf_overlay.c
libavfilter/vf_showinfo.c
libavfilter/vf_unsharp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agovp9/x86: simplify FILTER_INIT.
Clément Bœsch [Sat, 19 Apr 2014 15:23:46 +0000 (17:23 +0200)]
vp9/x86: simplify FILTER_INIT.

In the 2 FILTER_INIT usages, the source is already preloaded so that
extra complexity taken from FILTER_UPDATE is not necessary.

Also add forgotten "mask" argument in FILTER_{INIT,UPDATE} comments.

5 years agovp9/x86: clarify mixed splatb.
Clément Bœsch [Sat, 19 Apr 2014 15:00:51 +0000 (17:00 +0200)]
vp9/x86: clarify mixed splatb.

5 years agofate: add tests for SGI RLE and MVC1&2 decoders
Vittorio Giovara [Thu, 13 Mar 2014 16:16:52 +0000 (17:16 +0100)]
fate: add tests for SGI RLE and MVC1&2 decoders

5 years agoSilicon Graphics Movie demuxer
Peter Ross [Mon, 17 Dec 2012 09:37:54 +0000 (20:37 +1100)]
Silicon Graphics Movie demuxer

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agoSilicon Graphics Motion Video Compressor 1 & 2 decoder
Peter Ross [Mon, 17 Dec 2012 09:37:54 +0000 (20:37 +1100)]
Silicon Graphics Motion Video Compressor 1 & 2 decoder

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agoSilicon Graphics RLE 8-bit video decoder
Peter Ross [Mon, 17 Dec 2012 09:37:54 +0000 (20:37 +1100)]
Silicon Graphics RLE 8-bit video decoder

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agoh264: codec reinit: remove statements without effect
Janne Grunau [Fri, 18 Apr 2014 12:07:52 +0000 (12:07 +0000)]
h264: codec reinit: remove statements without effect

avctx->coded_{height,width} will always equal h->{height,width} since
init_dimensions() does that explicitly, Size changes are detected by
changes in mb_{height,width} earlier and propagated through the
needs_reinit variable.

5 years agoutils: add yvyu422 to avcodec_align_dimensions2
Vittorio Giovara [Tue, 15 Apr 2014 13:47:30 +0000 (15:47 +0200)]
utils: add yvyu422 to avcodec_align_dimensions2

5 years agofiltfmts: remove unused lavf include
Vittorio Giovara [Sat, 19 Apr 2014 01:02:26 +0000 (03:02 +0200)]
filtfmts: remove unused lavf include

5 years agolavfi: name anonymous structs
Vittorio Giovara [Fri, 11 Apr 2014 09:54:15 +0000 (11:54 +0200)]
lavfi: name anonymous structs

5 years agox86/float_dsp: remove duplicated code from vector_dmul_scalar
James Almer [Sat, 19 Apr 2014 07:26:10 +0000 (04:26 -0300)]
x86/float_dsp: remove duplicated code from vector_dmul_scalar

Use the xm# and ym# aliases as they remain in sync with m# after a SWAP.
No actual changes to the assembly.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Sat, 19 Apr 2014 11:47:02 +0000 (13:47 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Fix compilation with !HAVE_6REGS.
  Use MANGLE in cavsdsp.c to save two registers using gcc.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4936ef6492f640e1606c6507f2c4e495164d3974'
Michael Niedermayer [Sat, 19 Apr 2014 11:38:55 +0000 (13:38 +0200)]
Merge commit '4936ef6492f640e1606c6507f2c4e495164d3974'

* commit '4936ef6492f640e1606c6507f2c4e495164d3974':
  configure: Handle armcc 5.0

Conflicts:
configure

See: db55365d0f938ee93ed660a14c07f10f2a66dd10
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: Handle armcc 5.0
Martin Storsjö [Fri, 18 Apr 2014 20:40:59 +0000 (23:40 +0300)]
configure: Handle armcc 5.0

The first line of the "armcc --vsn" output in one version is
"Product: ARM Compiler 5.04".

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoFix compilation with !HAVE_6REGS.
Carl Eugen Hoyos [Sat, 19 Apr 2014 07:56:01 +0000 (09:56 +0200)]
Fix compilation with !HAVE_6REGS.

Can be tested with:
$ ./configure --cc='cc -m32' --disable-optimizations --enable-pic

5 years agoUse MANGLE in cavsdsp.c to save two registers using gcc.
Carl Eugen Hoyos [Sat, 19 Apr 2014 07:54:26 +0000 (09:54 +0200)]
Use MANGLE in cavsdsp.c to save two registers using gcc.

Fixes compilation with !HAVE_6REGS.

5 years agoavformat/mlv: add fate sample
Peter Ross [Sun, 30 Mar 2014 02:11:25 +0000 (13:11 +1100)]
avformat/mlv: add fate sample

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMagic Lantern Video (MLV) demuxer
Peter Ross [Thu, 17 Apr 2014 10:43:11 +0000 (20:43 +1000)]
Magic Lantern Video (MLV) demuxer

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoff_id3v2_read: add option to limit ID3 magic number search
Peter Ross [Fri, 18 Apr 2014 04:49:40 +0000 (14:49 +1000)]
ff_id3v2_read: add option to limit ID3 magic number search

Several chunked formats (AIFF, IFF,DSF) store ID3 metadata within an 'ID3 '
chunk tag. If such chunks are stored sequentially, it is possible for the
ID3v2 parser to confuse the chunk tag for the ID3 magic number. e.g.

[1st chunk tag ('ID3 ') | chunk size] [ID3 magic number | metadata ...]
[2nd chunk tag ('ID3 ') | chunk size] [ID3 magic number | metadata ...]

Fixes ticket #3530.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoff_id3v2_free_extra_meta: set the pointer pointing to extra_meta to NULL
Peter Ross [Sat, 19 Apr 2014 02:12:00 +0000 (12:12 +1000)]
ff_id3v2_free_extra_meta: set the pointer pointing to extra_meta to NULL

Fixes ticket #3530.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/wavdec: enlarge probe_packets for wav
csheng [Fri, 11 Apr 2014 07:33:50 +0000 (03:33 -0400)]
avformat/wavdec: enlarge probe_packets for wav

fix issue https://trac.ffmpeg.org/ticket/3550

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agofate: add DTS-ES test
James Almer [Wed, 16 Apr 2014 05:09:37 +0000 (02:09 -0300)]
fate: add DTS-ES test

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavd/xv: implement repaint message
Lukasz Marek [Fri, 18 Apr 2014 23:54:21 +0000 (01:54 +0200)]
lavd/xv: implement repaint message

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agolavd/xv: add window id param
Lukasz Marek [Fri, 18 Apr 2014 23:53:20 +0000 (01:53 +0200)]
lavd/xv: add window id param

Device is able to use existing window, that can be a
part of existing GUI - instead of newly created one.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agolavd/xv: keep aspect ratio
Lukasz Marek [Fri, 18 Apr 2014 17:31:52 +0000 (19:31 +0200)]
lavd/xv: keep aspect ratio

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agoavfilter/vf_rotate: make int*90° rotates suck less speedwise
Michael Niedermayer [Fri, 18 Apr 2014 22:08:15 +0000 (00:08 +0200)]
avfilter/vf_rotate: make int*90° rotates suck less speedwise

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_rotate: fix several of by 1 errors
Michael Niedermayer [Fri, 18 Apr 2014 23:12:54 +0000 (01:12 +0200)]
avfilter/vf_rotate: fix several of by 1 errors

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_rotate: fix location of update operation
Michael Niedermayer [Fri, 18 Apr 2014 22:48:33 +0000 (00:48 +0200)]
avfilter/vf_rotate: fix location of update operation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_rotate: increase fixed point precision
Michael Niedermayer [Fri, 18 Apr 2014 22:29:57 +0000 (00:29 +0200)]
avfilter/vf_rotate: increase fixed point precision

This ensures int_sins output doesnt have "random" lsbs

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoFix standalone compilation of image2_alias_pix and image2_brender_pix demuxers.
Carl Eugen Hoyos [Fri, 18 Apr 2014 22:46:23 +0000 (00:46 +0200)]
Fix standalone compilation of image2_alias_pix and image2_brender_pix demuxers.

5 years agoavcodec/qtrleenc: use av_mallocz_array()
Michael Niedermayer [Fri, 18 Apr 2014 16:57:58 +0000 (18:57 +0200)]
avcodec/qtrleenc: use av_mallocz_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/smacker: use av_mallocz_array()
Michael Niedermayer [Fri, 18 Apr 2014 16:56:39 +0000 (18:56 +0200)]
avcodec/smacker: use av_mallocz_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/roqvideoenc: use av_malloc(z)_array()
Michael Niedermayer [Fri, 18 Apr 2014 16:53:13 +0000 (18:53 +0200)]
avcodec/roqvideoenc: use av_malloc(z)_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agomjpeg: cosmetics: indentation
Justin Ruggles [Thu, 17 Apr 2014 22:10:25 +0000 (18:10 -0400)]
mjpeg: cosmetics: indentation

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agomjpeg: Do not fail jpeg decoding on bad EXIF data.
Justin Ruggles [Thu, 17 Apr 2014 22:09:46 +0000 (18:09 -0400)]
mjpeg: Do not fail jpeg decoding on bad EXIF data.

It is not required to correctly decode the image.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoconfigure: Remove deprecated incompatible_fork_abi option
James Almer [Fri, 4 Apr 2014 01:38:56 +0000 (22:38 -0300)]
configure: Remove deprecated incompatible_fork_abi option

It's been deprecated since ffmpeg 2.0

Signed-off-by: James Almer <jamrial@gmail.com>
Analysis of the usage of the switches by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/snow: use av_malloc(z)_array()
Michael Niedermayer [Fri, 18 Apr 2014 13:22:29 +0000 (15:22 +0200)]
avcodec/snow: use av_malloc(z)_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/tta: use av_malloc(z)_array()
Michael Niedermayer [Fri, 18 Apr 2014 13:19:09 +0000 (15:19 +0200)]
avcodec/tta: use av_malloc(z)_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/vc1dec: use av_realloc_array()
Michael Niedermayer [Fri, 18 Apr 2014 13:15:08 +0000 (15:15 +0200)]
avcodec/vc1dec: use av_realloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/dsddec: create audio stream before processing id3
Peter Ross [Fri, 18 Apr 2014 05:56:28 +0000 (15:56 +1000)]
avformat/dsddec: create audio stream before processing id3

This ensures stream[0] is always the audio stream (an assumption made
in dsf_read_packet).

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoDo not overwrite VDPAU structures in ff_MPV_frame_start().
Carl Eugen Hoyos [Fri, 18 Apr 2014 02:56:34 +0000 (04:56 +0200)]
Do not overwrite VDPAU structures in ff_MPV_frame_start().

Fixes crashes with VDR and MPlayer as reported by irc user crow.

5 years agoMerge remote-tracking branch 'lukaszmluki/master'
Michael Niedermayer [Fri, 18 Apr 2014 02:38:44 +0000 (04:38 +0200)]
Merge remote-tracking branch 'lukaszmluki/master'

* lukaszmluki/master:
  lavd/pulse_audio_enc: implement pause messages
  lavd/pulse_audio_enc: implement volume messages
  lavd/avdevice: add volume messages
  lavd/pulse_audio_enc: add buffer fullness messages
  lavd/pulse_audio_enc: add nonblocking mode
  lavd/pulse_audio_enc: replace simple API with async API
  lavd/pulse_audio_enc: cosmetics
  lavd/pulse_audio_common: add context helper functions
  lavd/pulse_audio_common: rename variables and enums

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoDSD Stream File (DSF) demuxer
Peter Ross [Thu, 17 Apr 2014 11:01:08 +0000 (21:01 +1000)]
DSD Stream File (DSF) demuxer

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavd/pulse_audio_enc: implement pause messages
Lukasz Marek [Wed, 16 Apr 2014 18:16:20 +0000 (20:16 +0200)]
lavd/pulse_audio_enc: implement pause messages

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agolavd/pulse_audio_enc: implement volume messages
Lukasz Marek [Tue, 15 Apr 2014 20:07:09 +0000 (22:07 +0200)]
lavd/pulse_audio_enc: implement volume messages

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agolavd/avdevice: add volume messages
Lukasz Marek [Tue, 15 Apr 2014 20:06:17 +0000 (22:06 +0200)]
lavd/avdevice: add volume messages

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agolavd/pulse_audio_enc: add buffer fullness messages
Lukasz Marek [Fri, 11 Apr 2014 00:05:49 +0000 (02:05 +0200)]
lavd/pulse_audio_enc: add buffer fullness messages

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agolavd/pulse_audio_enc: add nonblocking mode
Lukasz Marek [Sun, 6 Apr 2014 21:12:44 +0000 (23:12 +0200)]
lavd/pulse_audio_enc: add nonblocking mode

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agolavd/pulse_audio_enc: replace simple API with async API
Lukasz Marek [Sun, 6 Apr 2014 21:11:46 +0000 (23:11 +0200)]
lavd/pulse_audio_enc: replace simple API with async API

Async API allows to use full capabilites of PulseAudio.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agolavd/pulse_audio_enc: cosmetics
Lukasz Marek [Thu, 17 Apr 2014 23:10:20 +0000 (01:10 +0200)]
lavd/pulse_audio_enc: cosmetics

5 years agolavd/pulse_audio_common: add context helper functions
Lukasz Marek [Wed, 16 Apr 2014 13:23:46 +0000 (15:23 +0200)]
lavd/pulse_audio_common: add context helper functions

Functions allow to connect and disconnect from server.
Helpfull to implement utility functions with nested loops.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agolavd/pulse_audio_common: rename variables and enums
Lukasz Marek [Wed, 16 Apr 2014 13:24:33 +0000 (15:24 +0200)]
lavd/pulse_audio_common: rename variables and enums

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agoavformat/replaygain: fix mixed declaration and statement
Michael Niedermayer [Thu, 17 Apr 2014 23:16:27 +0000 (01:16 +0200)]
avformat/replaygain: fix mixed declaration and statement

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg: fix mixed merged & split side data with the stream->packet hack
Michael Niedermayer [Thu, 17 Apr 2014 23:01:38 +0000 (01:01 +0200)]
ffmpeg: fix mixed merged & split side data with the stream->packet hack

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '32d05934abc7427bb90380a4c1ab20a15fd7d821'
Michael Niedermayer [Thu, 17 Apr 2014 21:51:45 +0000 (23:51 +0200)]
Merge commit '32d05934abc7427bb90380a4c1ab20a15fd7d821'

* commit '32d05934abc7427bb90380a4c1ab20a15fd7d821':
  mp3dec: decode more data from Info header

Conflicts:
libavformat/mp3dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '0983d48111f578e17e8c1967d25ce593fce62b63'
Michael Niedermayer [Thu, 17 Apr 2014 20:38:51 +0000 (22:38 +0200)]
Merge commit '0983d48111f578e17e8c1967d25ce593fce62b63'

* commit '0983d48111f578e17e8c1967d25ce593fce62b63':
  crc: add ANSI CRC16 LE

Conflicts:
doc/APIchanges
libavutil/crc.c
libavutil/crc.h
libavutil/version.h
tests/ref/fate/crc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'fbd8e042107ec63e0ddf155588c59dcb76007641'
Michael Niedermayer [Thu, 17 Apr 2014 20:07:45 +0000 (22:07 +0200)]
Merge commit 'fbd8e042107ec63e0ddf155588c59dcb76007641'

* commit 'fbd8e042107ec63e0ddf155588c59dcb76007641':
  mp3dec: move XING/Info and VBRI parsing into their own functions

Conflicts:
libavformat/mp3dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ae43c10e36197000de2f3cc99ea35727ce98a796'
Michael Niedermayer [Thu, 17 Apr 2014 19:45:39 +0000 (21:45 +0200)]
Merge commit 'ae43c10e36197000de2f3cc99ea35727ce98a796'

* commit 'ae43c10e36197000de2f3cc99ea35727ce98a796':
  replaygain: allow exporting already decoded replaygain values

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '21d8f4da91673051ad7055cf63d989488a56368e'
Michael Niedermayer [Thu, 17 Apr 2014 19:07:21 +0000 (21:07 +0200)]
Merge commit '21d8f4da91673051ad7055cf63d989488a56368e'

* commit '21d8f4da91673051ad7055cf63d989488a56368e':
  resample: remove an unneeded context variable

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agomp3dec: decode more data from Info header
Alessandro Ghedini [Sun, 13 Apr 2014 12:23:57 +0000 (14:23 +0200)]
mp3dec: decode more data from Info header

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agocrc: add ANSI CRC16 LE
Alessandro Ghedini [Mon, 14 Apr 2014 08:18:53 +0000 (10:18 +0200)]
crc: add ANSI CRC16 LE

This adds the reversed byte-order version of the ANSI CRC16.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agomp3dec: move XING/Info and VBRI parsing into their own functions
Alessandro Ghedini [Sat, 12 Apr 2014 16:25:41 +0000 (18:25 +0200)]
mp3dec: move XING/Info and VBRI parsing into their own functions

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoreplaygain: allow exporting already decoded replaygain values
Alessandro Ghedini [Sat, 12 Apr 2014 16:25:40 +0000 (18:25 +0200)]
replaygain: allow exporting already decoded replaygain values

This adds a function to export raw replaygain values (i.e. in the (u)int32_t
form). It first checks whether AV_PKT_DATA_REPLAYGAIN side data is present, in
which case it does nothing.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoresample: remove an unneeded context variable
Anton Khirnov [Sat, 22 Feb 2014 19:27:44 +0000 (20:27 +0100)]
resample: remove an unneeded context variable

5 years agoWrite sample_aspect_ratio to asf files.
Carl Eugen Hoyos [Thu, 17 Apr 2014 12:55:49 +0000 (14:55 +0200)]
Write sample_aspect_ratio to asf files.

Fixes ticket #3528.

5 years agoOnly insert the icpf atom in ProRes mkv packets if it isn't already present.
Carl Eugen Hoyos [Thu, 17 Apr 2014 12:46:11 +0000 (14:46 +0200)]
Only insert the icpf atom in ProRes mkv packets if it isn't already present.

The patch allows to read broken mkv files containing ProRes as written by
the Haali muxer.
Fixes a part of ticket #3434.

5 years agox86/dsputil: use HADDD where applicable
James Almer [Fri, 11 Apr 2014 23:00:21 +0000 (20:00 -0300)]
x86/dsputil: use HADDD where applicable

Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86: move horizontal add macros to x86util
James Almer [Wed, 16 Apr 2014 23:15:35 +0000 (20:15 -0300)]
x86: move horizontal add macros to x86util

Also port relevant AVX2/XOP optimizations from x264 with permission
to relicense to LGPL from the corresponding authors

Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f1b239ec8b38474d31f3bfea1f0b1693774fa432'
Michael Niedermayer [Thu, 17 Apr 2014 01:42:17 +0000 (03:42 +0200)]
Merge commit 'f1b239ec8b38474d31f3bfea1f0b1693774fa432'

* commit 'f1b239ec8b38474d31f3bfea1f0b1693774fa432':
  drawtext: Add fontconfig support

Conflicts:
configure
doc/filters.texi
libavfilter/vf_drawtext.c

See: 40b7a27bad8b8b35cb215bf4f4cba02a00d6f9e2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodrawtext: Add fontconfig support
Luca Barbato [Sat, 12 Apr 2014 14:02:50 +0000 (16:02 +0200)]
drawtext: Add fontconfig support

Introduce the `font` option and make it optional to pass a fontfile.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoFix compilation with --disable-everything --enable-muxer=avi --disable-network.
Anh [Wed, 16 Apr 2014 18:00:17 +0000 (20:00 +0200)]
Fix compilation with --disable-everything --enable-muxer=avi --disable-network.

Fixes ticket #3568.

5 years agoavcodec/vble: use av_malloc_array()
Michael Niedermayer [Wed, 16 Apr 2014 17:45:43 +0000 (19:45 +0200)]
avcodec/vble: use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_pixdesctest: use av_malloc_array()
Michael Niedermayer [Wed, 16 Apr 2014 17:44:23 +0000 (19:44 +0200)]
avfilter/vf_pixdesctest: use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/ico: use avmalloc(z)_array()
Michael Niedermayer [Wed, 16 Apr 2014 17:41:41 +0000 (19:41 +0200)]
avformat/ico: use avmalloc(z)_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86/float_dsp: unroll loop in vector_fmac_scalar
James Almer [Wed, 16 Apr 2014 05:09:36 +0000 (02:09 -0300)]
x86/float_dsp: unroll loop in vector_fmac_scalar

~6% faster SSE2 performance. AVX/FMA3 are unaffected.

Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoFix OpenGL device compilation with msvc gl.h
Matt Oliver [Tue, 15 Apr 2014 05:22:50 +0000 (15:22 +1000)]
Fix OpenGL device compilation with msvc gl.h

Reveiwed-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mpegenc: try to improve the VBV buffer warning
Michael Niedermayer [Wed, 16 Apr 2014 15:05:05 +0000 (17:05 +0200)]
avformat/mpegenc: try to improve the VBV buffer warning

Maybe fixes Ticket 3494
Part of the message suggested by: rogerdpack
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86/float_dsp: use SWAP in vector_fmac_scalar Win64
James Almer [Wed, 16 Apr 2014 05:09:35 +0000 (02:09 -0300)]
x86/float_dsp: use SWAP in vector_fmac_scalar Win64

The mova is unnecessary

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoiavcodec/vc1dec: Fix missing {}
Michael Niedermayer [Wed, 16 Apr 2014 00:06:37 +0000 (02:06 +0200)]
iavcodec/vc1dec: Fix missing {}

Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_deshake: fix loss of precission with odd resolutions
Michael Niedermayer [Wed, 16 Apr 2014 00:06:37 +0000 (02:06 +0200)]
avfilter/vf_deshake: fix loss of precission with odd resolutions

Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/f_select: fix loss of precission in SAD calculation
Michael Niedermayer [Wed, 16 Apr 2014 00:06:37 +0000 (02:06 +0200)]
avfilter/f_select: fix loss of precission in SAD calculation

Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/g723_1: add assert to help static code analyzers
Michael Niedermayer [Wed, 16 Apr 2014 00:55:13 +0000 (02:55 +0200)]
avcodec/g723_1: add assert to help static code analyzers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/diracdec: fix undefined behavior with shifts
Michael Niedermayer [Wed, 16 Apr 2014 00:06:37 +0000 (02:06 +0200)]
avcodec/diracdec: fix undefined behavior with shifts

Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mpegts: Remove redundant check
Michael Niedermayer [Wed, 16 Apr 2014 00:06:37 +0000 (02:06 +0200)]
avformat/mpegts: Remove redundant check

Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/fic: Fix return value check
Michael Niedermayer [Wed, 16 Apr 2014 00:06:37 +0000 (02:06 +0200)]
avcodec/fic: Fix return value check

Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/dcadec: fix error message suppression code
Michael Niedermayer [Wed, 16 Apr 2014 00:06:37 +0000 (02:06 +0200)]
avcodec/dcadec: fix error message suppression code

Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mjpegen: Fix declared argument size
Michael Niedermayer [Wed, 16 Apr 2014 00:06:37 +0000 (02:06 +0200)]
avcodec/mjpegen: Fix declared argument size

Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswscale/swscale: fix srcStride/srcSlice typo
Michael Niedermayer [Tue, 15 Apr 2014 23:55:08 +0000 (01:55 +0200)]
swscale/swscale: fix srcStride/srcSlice typo

Fixes part of Ticket3466
Found by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>