ffmpeg.git
5 years agoavformat/mux: Check for and remove invalid packet durations
Michael Niedermayer [Wed, 23 Apr 2014 04:04:50 +0000 (06:04 +0200)]
avformat/mux: Check for and remove invalid packet durations

Fixes assertion failure
Fixes Ticket3575

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/flvdec: also include file position in debug output
Michael Niedermayer [Wed, 23 Apr 2014 00:21:27 +0000 (02:21 +0200)]
avformat/flvdec: also include file position in debug output

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/avutil.h: remove duplicate rational.h include
Michael Niedermayer [Tue, 22 Apr 2014 22:49:34 +0000 (00:49 +0200)]
avutil/avutil.h: remove duplicate rational.h include

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b0bdc2a7123abd0287de435726ab68e9e475a8d8'
Michael Niedermayer [Tue, 22 Apr 2014 22:46:28 +0000 (00:46 +0200)]
Merge commit 'b0bdc2a7123abd0287de435726ab68e9e475a8d8'

* commit 'b0bdc2a7123abd0287de435726ab68e9e475a8d8':
  avutil: move av_get_time_base_q() after include rational.h

See: c7251fec39c5b54470bb295acfc81d89683843c7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '502512ea0f179165782777265f441d4061ff6012'
Michael Niedermayer [Tue, 22 Apr 2014 22:37:16 +0000 (00:37 +0200)]
Merge commit '502512ea0f179165782777265f441d4061ff6012'

* commit '502512ea0f179165782777265f441d4061ff6012':
  avutil: Add av_get_time_base_q()

Conflicts:
doc/APIchanges
libavutil/utils.c
libavutil/version.h

See: dac7e8a94e49e41f1dd0af34dc17d124d5b156ba
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9155c595f1a9c5a089a59e2c0aefdfabd0a6c59b'
Michael Niedermayer [Tue, 22 Apr 2014 22:13:18 +0000 (00:13 +0200)]
Merge commit '9155c595f1a9c5a089a59e2c0aefdfabd0a6c59b'

* commit '9155c595f1a9c5a089a59e2c0aefdfabd0a6c59b':
  fic: Support rendering cursors

Not merged as the commit is missing changes that where replied to with "done" on ffmpeg-devel

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '40b331e1f41cf118bd1b0807cac801437255636f'
Michael Niedermayer [Tue, 22 Apr 2014 21:57:35 +0000 (23:57 +0200)]
Merge commit '40b331e1f41cf118bd1b0807cac801437255636f'

* commit '40b331e1f41cf118bd1b0807cac801437255636f':
  fic: Use proper quantization matrix index

See: 6d149d28183a59a28143431f8e629484a52948b2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3956a5e0ea46ed7e27ca888fe11c47986ad99261'
Michael Niedermayer [Tue, 22 Apr 2014 21:51:13 +0000 (23:51 +0200)]
Merge commit '3956a5e0ea46ed7e27ca888fe11c47986ad99261'

* commit '3956a5e0ea46ed7e27ca888fe11c47986ad99261':
  aarch64: NEON vorbis_inverse_coupling

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '8f9fe6ae3461ce270bce6b7083fda5ec314cdad4'
Michael Niedermayer [Tue, 22 Apr 2014 21:45:44 +0000 (23:45 +0200)]
Merge commit '8f9fe6ae3461ce270bce6b7083fda5ec314cdad4'

* commit '8f9fe6ae3461ce270bce6b7083fda5ec314cdad4':
  aarch64: NEON fixed/floating point MPADSP apply_window

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil: move av_get_time_base_q() after include rational.h
Michael Niedermayer [Tue, 22 Apr 2014 20:44:14 +0000 (22:44 +0200)]
avutil: move av_get_time_base_q() after include rational.h

Fix compilation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoMerge commit 'f4d5a2cc35fcdf06ec031fabe8b0710e995fe924'
Michael Niedermayer [Tue, 22 Apr 2014 21:32:55 +0000 (23:32 +0200)]
Merge commit 'f4d5a2cc35fcdf06ec031fabe8b0710e995fe924'

* commit 'f4d5a2cc35fcdf06ec031fabe8b0710e995fe924':
  aarch64: NEON float to s16 audio conversion

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ee2bc5974fe64fd214f52574400ae01c85f4b855'
Michael Niedermayer [Tue, 22 Apr 2014 21:26:51 +0000 (23:26 +0200)]
Merge commit 'ee2bc5974fe64fd214f52574400ae01c85f4b855'

* commit 'ee2bc5974fe64fd214f52574400ae01c85f4b855':
  aarch64: NEON float (i)MDCT

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '650c4300d94aa9398ff1dd4f454bf39eaa285f62'
Michael Niedermayer [Tue, 22 Apr 2014 21:05:56 +0000 (23:05 +0200)]
Merge commit '650c4300d94aa9398ff1dd4f454bf39eaa285f62'

* commit '650c4300d94aa9398ff1dd4f454bf39eaa285f62':
  aarch64: NEON float FFT

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil: move av_get_time_base_q() after include rational.h
Michael Niedermayer [Tue, 22 Apr 2014 20:44:14 +0000 (22:44 +0200)]
avutil: move av_get_time_base_q() after include rational.h

Fix compilation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil: Add av_get_time_base_q()
Derek Buitenhuis [Tue, 22 Apr 2014 05:26:07 +0000 (07:26 +0200)]
avutil: Add av_get_time_base_q()

This fixes usage of AV_TIME_BASE_Q in C++ applications, which
cannot use compound literals directly in their code.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoavutil: Add av_get_time_base_q()
Derek Buitenhuis [Tue, 22 Apr 2014 05:26:07 +0000 (07:26 +0200)]
avutil: Add av_get_time_base_q()

This fixes usage of AV_TIME_BASE_Q in C++ applications, which
cannot use compound literals directly in their code.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agofic: Use proper quantization matrix index
Derek Buitenhuis [Sat, 19 Apr 2014 19:40:35 +0000 (15:40 -0400)]
fic: Use proper quantization matrix index

The matrices are not zigzagged.

Fixes artefacting.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agofic: Support rendering cursors
Derek Buitenhuis [Sat, 19 Apr 2014 22:46:52 +0000 (18:46 -0400)]
fic: Support rendering cursors

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agofic: Use proper quantization matrix index
Derek Buitenhuis [Sat, 19 Apr 2014 19:40:35 +0000 (15:40 -0400)]
fic: Use proper quantization matrix index

The matrices are not zigzagged.

Fixes artefacting.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoaarch64: NEON vorbis_inverse_coupling
Janne Grunau [Sun, 20 Apr 2014 15:57:36 +0000 (17:57 +0200)]
aarch64: NEON vorbis_inverse_coupling

From the ARMv7 NEON version. 16 times faster as the C version, overall
more than 12% faster vorbis decoding on Apple's A7.

5 years agoaarch64: NEON fixed/floating point MPADSP apply_window
Janne Grunau [Sat, 19 Apr 2014 16:17:23 +0000 (18:17 +0200)]
aarch64: NEON fixed/floating point MPADSP apply_window

30%/25% (fixed/float) faster mp3 decoding on Apple's A7. The floating
point decoder is approximately 7% faster.

5 years agoAdd "const" to avoid compiler warning.
Reimar Döffinger [Tue, 22 Apr 2014 18:41:34 +0000 (20:41 +0200)]
Add "const" to avoid compiler warning.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agoAdd missing ';'.
Reimar Döffinger [Tue, 22 Apr 2014 18:40:31 +0000 (20:40 +0200)]
Add missing ';'.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agoVarious small spelling fixes.
Reimar Döffinger [Mon, 14 Apr 2014 20:35:25 +0000 (22:35 +0200)]
Various small spelling fixes.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agoavcodec/dvbsubdec: use av_mallocz_array()
Michael Niedermayer [Tue, 22 Apr 2014 18:00:28 +0000 (20:00 +0200)]
avcodec/dvbsubdec: use av_mallocz_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/cook: use av_malloc_array()
Michael Niedermayer [Tue, 22 Apr 2014 18:00:14 +0000 (20:00 +0200)]
avcodec/cook: use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/dsddec: use av_malloc_array()
Michael Niedermayer [Tue, 22 Apr 2014 17:57:21 +0000 (19:57 +0200)]
avcodec/dsddec: use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoaarch64: NEON float to s16 audio conversion
Janne Grunau [Wed, 16 Apr 2014 21:47:32 +0000 (23:47 +0200)]
aarch64: NEON float to s16 audio conversion

5 years agoaarch64: NEON float (i)MDCT
Janne Grunau [Tue, 15 Apr 2014 16:35:57 +0000 (18:35 +0200)]
aarch64: NEON float (i)MDCT

Approximately as fast as the ARM NEON version on Apple's A7.

5 years agoaarch64: NEON float FFT
Janne Grunau [Wed, 26 Mar 2014 14:20:42 +0000 (15:20 +0100)]
aarch64: NEON float FFT

Approximately as fast as the ARM NEON version on Apple's A7.

5 years agoavformat/mpegtsenc: make the pes packet length omission optional
Michael Niedermayer [Tue, 22 Apr 2014 14:09:46 +0000 (16:09 +0200)]
avformat/mpegtsenc: make the pes packet length omission optional

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mpegtsenc: Changed Video PES packet length to 0.
Graham Booker [Sat, 12 Apr 2014 04:26:46 +0000 (23:26 -0500)]
avformat/mpegtsenc: Changed Video PES packet length to 0.

The rational for this is another issue that plex has exposed.  When it is
conducting a transcode of video to HLS for streaming, my father noticed
artifacts when played on his GoogleTV (NSZ-GT1).  He sent me a test file
and I reproduced it on my device of the same model.  It is important to
note that the artifacts were not present when streaming to VLC or QuickTime
Player.  I copied the command-line that plex used, and conducted all of the
following tests using FFmpeg git.

Transcode to HLS: artifacts on playback
Transcode to TS: playback is fine
Cat HLS segments into a single TS: playback is fine
Segment single TS file to segments: artifacts on playback
Segment single TS file to segments using Apple's HLS segmenter: playback is
fine

At this point I carefully examined the differences between Apple's HLS
segmenter output and FFmpeg's.  Among the considerable differences, I
noticed that the video PES packets always had a 0 length.  So I continued:

Transcode to HLS using FFmpeg with 0 length PES packets: playback is fine.
Segment single TS to segments with 0 length PES packets: playback is fine.

All failures mentioned are only on the GTV since it is the only player on
which I could reproduce artifacts.  I only tested the GTV, VLC, and
QuickTime Player though, so my test case is limited.  I do not know if
other players exhibit this issue.

Since it was useful last time, I have uploaded the test file as
hls_pes_packet_length.m4v along with its associated txt file which contains
the transcode command-line that was used.

Reviewed-by: Kieran Kunhya <kierank@obe.tv>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agovc1dsp: fix build without inline asm
Hendrik Leppkes [Tue, 22 Apr 2014 09:19:03 +0000 (11:19 +0200)]
vc1dsp: fix build without inline asm

Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f9157463dbcd2db8fe9504197c0c04d0d7d04f31'
Michael Niedermayer [Tue, 22 Apr 2014 11:56:05 +0000 (13:56 +0200)]
Merge commit 'f9157463dbcd2db8fe9504197c0c04d0d7d04f31'

* commit 'f9157463dbcd2db8fe9504197c0c04d0d7d04f31':
  lavf: do not use the parser duration for video

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1ae8198bca749a0cff205196cc83d35b9962849b'
Michael Niedermayer [Tue, 22 Apr 2014 11:45:34 +0000 (13:45 +0200)]
Merge commit '1ae8198bca749a0cff205196cc83d35b9962849b'

* commit '1ae8198bca749a0cff205196cc83d35b9962849b':
  avconv: always reset packet pts after decoding an audio frame

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b19a5e51981be5b69cf550a3bc17fe5300d0dbc9'
Michael Niedermayer [Tue, 22 Apr 2014 11:34:35 +0000 (13:34 +0200)]
Merge commit 'b19a5e51981be5b69cf550a3bc17fe5300d0dbc9'

* commit 'b19a5e51981be5b69cf550a3bc17fe5300d0dbc9':
  lavc: improve AVCodecContext.delay doxy

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a4ed995cabf220029f1d0e185a6fb45eed7b4091'
Michael Niedermayer [Tue, 22 Apr 2014 11:30:20 +0000 (13:30 +0200)]
Merge commit 'a4ed995cabf220029f1d0e185a6fb45eed7b4091'

* commit 'a4ed995cabf220029f1d0e185a6fb45eed7b4091':
  txd: do not set the codec timebase.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf: do not use the parser duration for video
Anton Khirnov [Sun, 13 Apr 2014 05:05:27 +0000 (07:05 +0200)]
lavf: do not use the parser duration for video

The parser has no way of knowing video duration, and therefore no video
parsers set it.

5 years agoavconv: always reset packet pts after decoding an audio frame
Anton Khirnov [Sat, 12 Apr 2014 19:55:46 +0000 (21:55 +0200)]
avconv: always reset packet pts after decoding an audio frame

Currently, if a decoder sets AVFrame.pts, we'd send the same timestamp
to it twice, which is wrong.

5 years agolavc: improve AVCodecContext.delay doxy
Anton Khirnov [Fri, 11 Apr 2014 15:47:51 +0000 (17:47 +0200)]
lavc: improve AVCodecContext.delay doxy

5 years agotxd: do not set the codec timebase.
Anton Khirnov [Sun, 13 Apr 2014 08:43:45 +0000 (10:43 +0200)]
txd: do not set the codec timebase.

It is not supposed to be changed from outside of lavc.
Set the stream timebase and average framerate instead.

5 years agoavformat/avidec: Speed up keyframe detection code
Michael Niedermayer [Tue, 22 Apr 2014 02:00:32 +0000 (04:00 +0200)]
avformat/avidec: Speed up keyframe detection code

Fixes Ticket3531

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMAINTAINERS: Add myself as FIC maintainer
Derek Buitenhuis [Mon, 21 Apr 2014 21:35:21 +0000 (17:35 -0400)]
MAINTAINERS: Add myself as FIC maintainer

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoavcodec/wma: use av_malloc_array()
Michael Niedermayer [Tue, 22 Apr 2014 00:41:05 +0000 (02:41 +0200)]
avcodec/wma: use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/pthread: Use av_mallocz_array()
Michael Niedermayer [Tue, 22 Apr 2014 00:40:20 +0000 (02:40 +0200)]
avfilter/pthread: Use av_mallocz_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/libxavs: Use av_mallocz_array()
Michael Niedermayer [Tue, 22 Apr 2014 00:39:23 +0000 (02:39 +0200)]
avcodec/libxavs: Use av_mallocz_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/cngenc: Use av_malloc_array()
Michael Niedermayer [Tue, 22 Apr 2014 00:38:03 +0000 (02:38 +0200)]
avcodec/cngenc: Use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/snow: use FF_ALLOC(Z)_ARRAY_OR_GOTO
Michael Niedermayer [Tue, 22 Apr 2014 00:12:02 +0000 (02:12 +0200)]
avcodec/snow: use FF_ALLOC(Z)_ARRAY_OR_GOTO

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/internal: add FF_ALLOC_ARRAY_OR_GOTO & FF_ALLOCZ_ARRAY_OR_GOTO
Michael Niedermayer [Fri, 18 Apr 2014 13:25:00 +0000 (15:25 +0200)]
avutil/internal: add FF_ALLOC_ARRAY_OR_GOTO & FF_ALLOCZ_ARRAY_OR_GOTO

These are similar to the existing FF_ALLOCZ_OR_GOTO & FF_ALLOC_OR_GOTO

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1c7b71a5bdb88ebb69734100405bbb5441b871e8'
Michael Niedermayer [Mon, 21 Apr 2014 21:54:53 +0000 (23:54 +0200)]
Merge commit '1c7b71a5bdb88ebb69734100405bbb5441b871e8'

* commit '1c7b71a5bdb88ebb69734100405bbb5441b871e8':
  mpegvideo: Use the current_picture pts

See: c354576457c8ae0906d6f4f20c80816f3e3bb55d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6f243b17c537646b894857d43dfdac65f85ab377'
Michael Niedermayer [Mon, 21 Apr 2014 21:53:21 +0000 (23:53 +0200)]
Merge commit '6f243b17c537646b894857d43dfdac65f85ab377'

* commit '6f243b17c537646b894857d43dfdac65f85ab377':
  avcodec/fic: Fix return value check

See: 230db1426d127a25c03b457fec25900653de2721
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '144f7a561d32ae9bc657a217e2b4c6dd9a0d7df9'
Michael Niedermayer [Mon, 21 Apr 2014 21:52:22 +0000 (23:52 +0200)]
Merge commit '144f7a561d32ae9bc657a217e2b4c6dd9a0d7df9'

* commit '144f7a561d32ae9bc657a217e2b4c6dd9a0d7df9':
  avcodec/fic: clear slice_data

See: 1db8bc56488c888d57f5339812bd6f4117d85c3e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f34d3173fcfc7f3228095d509a64c4fa4b37b575'
Michael Niedermayer [Mon, 21 Apr 2014 21:37:19 +0000 (23:37 +0200)]
Merge commit 'f34d3173fcfc7f3228095d509a64c4fa4b37b575'

* commit 'f34d3173fcfc7f3228095d509a64c4fa4b37b575':
  avcodec/fic: fix slice checks

See: d46ef40129487143f2fa4e0b44b3f5e788c4fcb2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agompegvideo: Use the current_picture pts
Michael Niedermayer [Fri, 18 Apr 2014 21:11:31 +0000 (23:11 +0200)]
mpegvideo: Use the current_picture pts

The picture slot can be recycled by select_input_picture and
only current_picture is populated with the valid pts.

Unbreak timestamps when in cbr mode.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
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>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoavcodec/fic: clear slice_data
Michael Niedermayer [Sat, 15 Feb 2014 16:19:59 +0000 (17:19 +0100)]
avcodec/fic: clear slice_data

Fixes artifacts
Fixes use of freed memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoavcodec/fic: fix slice checks
Michael Niedermayer [Sat, 15 Feb 2014 16:19:32 +0000 (17:19 +0100)]
avcodec/fic: fix slice checks

fix integer overflows

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoMerge commit '93e15a323871613fd26f1f1e317029a50b5b24ca'
Michael Niedermayer [Mon, 21 Apr 2014 18:20:19 +0000 (20:20 +0200)]
Merge commit '93e15a323871613fd26f1f1e317029a50b5b24ca'

* commit '93e15a323871613fd26f1f1e317029a50b5b24ca':
  fic: use correct IDCT

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agofic: use correct IDCT
Kostya Shishkov [Tue, 1 Apr 2014 19:00:47 +0000 (21:00 +0200)]
fic: use correct IDCT

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoavfilter/filtfmts: Support dynamically allocated in/outputs
Michael Niedermayer [Mon, 21 Apr 2014 09:33:17 +0000 (11:33 +0200)]
avfilter/filtfmts: Support dynamically allocated in/outputs

Fixes crash
Fixes Ticket3468

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat: Fix decoder search in find stream info
Michael Niedermayer [Mon, 21 Apr 2014 01:38:07 +0000 (03:38 +0200)]
avformat: Fix decoder search in find stream info

Fixes Ticket3548

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/asfenc: dont allow non interleaved packets
Michael Niedermayer [Mon, 21 Apr 2014 00:39:00 +0000 (02:39 +0200)]
avformat/asfenc: dont allow non interleaved packets

The muxer does not support this currently

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/pmpdec: remove cur_dts timestamp hack
Michael Niedermayer [Sun, 20 Apr 2014 22:58:24 +0000 (00:58 +0200)]
avformat/pmpdec: remove cur_dts timestamp hack

It appears the demuxer works fine without it

Fixes Ticket3534

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/x86/vp9lpf: add a comment above a bunch of SWAP.
Clément Bœsch [Sun, 20 Apr 2014 19:33:58 +0000 (21:33 +0200)]
avcodec/x86/vp9lpf: add a comment above a bunch of SWAP.

5 years agoavcodec/x86/vp9lpf: merge a few movs with other instructions.
Clément Bœsch [Sun, 20 Apr 2014 19:19:30 +0000 (21:19 +0200)]
avcodec/x86/vp9lpf: merge a few movs with other instructions.

5 years agolavf/pcm: remove redundant check
Lukasz Marek [Sun, 20 Apr 2014 17:54:09 +0000 (19:54 +0200)]
lavf/pcm: remove redundant check

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/arm/vc1dsp_init_neon: fix code so it compiles and passes fate-vc1
Michael Niedermayer [Sun, 20 Apr 2014 18:19:17 +0000 (20:19 +0200)]
avcodec/arm/vc1dsp_init_neon: fix code so it compiles and passes fate-vc1

The original patch  seems to be missing a 16x16 function though

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agovc1dsp: introduce cases for 8x8 and 16x16
Christophe Gisquet [Fri, 11 Apr 2014 19:02:08 +0000 (21:02 +0200)]
vc1dsp: introduce cases for 8x8 and 16x16

This allows further unrolling the DSP implementation where possible.

x86 and ARM DSP modified by simply moving the multiple calls from vc1dec
to the DSP code. Decoding improvements should only occurs because of the
compiler actually able to unroll more.

Decoding time: ~8.80s -> 8.64s (ie around 2%)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcdoec/webp: use av_malloc_array()
Michael Niedermayer [Sun, 20 Apr 2014 15:35:19 +0000 (17:35 +0200)]
avcdoec/webp: use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/tiff: use av_malloc(z)_array()
Michael Niedermayer [Sun, 20 Apr 2014 15:32:17 +0000 (17:32 +0200)]
avcodec/tiff: use av_malloc(z)_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/ratecontrol: use av_malloc_array()
Michael Niedermayer [Sun, 20 Apr 2014 15:30:15 +0000 (17:30 +0200)]
avcodec/ratecontrol: use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/huffman: use av_malloc_array()
Michael Niedermayer [Sun, 20 Apr 2014 15:25:01 +0000 (17:25 +0200)]
avcodec/huffman: use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/exif: do not follow 0 offsets
Michael Niedermayer [Sun, 20 Apr 2014 02:13:43 +0000 (04:13 +0200)]
avcodec/exif: do not follow 0 offsets

Fixes exif decoding failure of 1295328_300.jpg

Reviewed-by; Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/exif/exif_add_metadata: add support for SSHORT & SBYTE
Michael Niedermayer [Sun, 20 Apr 2014 00:58:02 +0000 (02:58 +0200)]
avcodec/exif/exif_add_metadata: add support for SSHORT & SBYTE

No working testcase, this omission was just spoted when the parser apparently went out of
sync.

Reviewed-by; Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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>