wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
68353 commits 40 branches 405 tags 230 MiB
Commit graph

68353 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Niedermayer
bd378acad4 Merge commit '95d880fa64' 
* commit '95d880fa64':
  rtpproto: Fix the input RTP data format check

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-10 01:24:12 +01:00
Michael Niedermayer
b7bfe17824 Merge commit 'd2f1d42b18' 
* commit 'd2f1d42b18':
  fate: add dolby true hd tests

Conflicts:
	tests/fate/lossless-audio.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-10 00:58:13 +01:00
Michael Niedermayer
cb416a7d79 Merge commit '4c81613df4' 
* commit '4c81613df4':
  arm: mlpdsp: handle pic offset calculation in a macro

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-10 00:51:26 +01:00
Michael Niedermayer
824932dc47 Merge commit '581c7f0e12' 
* commit '581c7f0e12':
  arm: make ff_mlp_filter_channel_arm and ff_mlp_rematrix_channel_arm position independent

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-10 00:39:00 +01:00
Martin Storsjö
95d880fa64 rtpproto: Fix the input RTP data format check 
Only the upper 2 bits of the first byte are known to be
a fixed value.

The lower bits in the first byte of a RTP packet could be set
if the input is from another RTP packetizers than libavformat's,
but for RTCP packets, they would also be set when sending RTCP RR
packets, triggering false warnings about incorrect input format
to the protocol.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-12-09 23:59:14 +02:00
Carl Eugen Hoyos
01ab761b46 Allow mov musing if the ac3 parser was disabled. 
This reverts 8091fe30.
Reported and tested by Takashi, ffmpeg-list dubistmeinheld de
 2014-12-09 22:12:53 +01:00
Janne Grunau
d2f1d42b18 fate: add dolby true hd tests 
The existing meridian audio test does not test
ff_mlp_rematrix_channel_arm. This sample (first 640k of
https://samples.libav.org/A-codecs/TrueHD/TrueHD.raw) uses
ff_mlp_rematrix_channel_arm. Since this sample has 5.1 channels it also
allows testing the integrated downmixing.
 2014-12-09 22:00:08 +01:00
Janne Grunau
4c81613df4 arm: mlpdsp: handle pic offset calculation in a macro 
Makes the code easier to read since it hides different offset
calculations for arm and thumb mode.
 2014-12-09 22:00:08 +01:00
Janne Grunau
581c7f0e12 arm: make ff_mlp_filter_channel_arm and ff_mlp_rematrix_channel_arm position independent 
No significant difference in used cpu cycles on a cortex-a9.
 2014-12-09 22:00:08 +01:00
Michael Niedermayer
6ef9d1b216 Merge commit 'fccfc22d1f' 
* commit 'fccfc22d1f':
  libavformat: Build hevc.o when building the RTP muxer

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-09 21:40:09 +01:00
Michael Niedermayer
2d0117f816 avformat/crypto: fix key vs iv typo 
Fixes Ticket 4167

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-09 19:58:56 +01:00
Michael Niedermayer
20cb3fab3f avformat/utils: change assert to av_assert0() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-09 17:57:35 +01:00
Michael Niedermayer
041c6109da avformat/utils: replace impossible condition by av_assert0() in ff_gen_search() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-09 17:53:30 +01:00
Michael Niedermayer
308429e124 avformat/wavenc: check return value of strftime() 
Fixes CID1257006

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-09 16:15:40 +01:00
Martin Storsjö
fccfc22d1f libavformat: Build hevc.o when building the RTP muxer 
The RTP muxer enables the actual codepaths within sdp.c,
which depend on hevc.o since e5cfc8fd.

This fixes builds with --disable-everything --enable-muxer=rtp.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-12-09 16:09:37 +02:00
Michael Niedermayer
92d47e2aa3 Merge commit '780cd20b00' 
* commit '780cd20b00':
  aarch64: Use .data.rel.ro for const data with relocations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-09 12:08:29 +01:00
Michael Niedermayer
16e65419ed Merge commit 'f963f80399' 
* commit 'f963f80399':
  arm: Use .data.rel.ro for const data with relocations

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-09 11:58:13 +01:00
Michael Niedermayer
99bf26fc6b Merge commit '3c01039e0b' 
* commit '3c01039e0b':
  mov: further expand the list of parsed metadata tags

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-09 11:50:48 +01:00
Martin Storsjö
780cd20b00 aarch64: Use .data.rel.ro for const data with relocations 
This reverts commit c00365b46d
in addition to using a different section.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-12-09 11:43:31 +02:00
Martin Storsjö
f963f80399 arm: Use .data.rel.ro for const data with relocations 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-12-09 11:43:25 +02:00
Michael Niedermayer
a5e5959d52 avformat/utils: fix calculating the absolute difference of timestamps 
we dont use FFABS(a-b) as that could result in undefined behavior if it overflows

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-09 06:13:32 +01:00
Reynaldo H. Verdejo Pinochet
720dffb843 ffserver_config: reflow add_codec() 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2014-12-09 01:03:01 -03:00
Reynaldo H. Verdejo Pinochet
b4c69b7ea8 ffserver_config: break lines at 80 chars 
Add braces when needed and drop redundant parethesis while at it.

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2014-12-09 01:03:01 -03:00
Reynaldo H. Verdejo Pinochet
b28d587782 ffserver_config: improve error/warning messages 
Fix grammar and quote user-supplied values.

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2014-12-09 01:03:01 -03:00
Reynaldo H. Verdejo Pinochet
f95cfff077 ffserver_config: check strchr() return for NULL 
Should fix FFmpeg Coverity Scan issue #1257013

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2014-12-09 01:03:01 -03:00
Michael Niedermayer
dd70470d72 avformat/utils: Compute the current pts of mpeg1/2 I/P frames from the next frame when available 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-09 03:34:20 +01:00
Michael Niedermayer
9e561410c0 avformat/utils: Pass the next pts/dts to compute_pkt_fields() when available 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-09 03:33:44 +01:00
Michael Niedermayer
e86df0206f avdevice/xcbgrab: check xcb_query_pointer_reply_t pointer before use 
Fixes CID1254668

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-09 01:54:51 +01:00
Moritz Barsnick
754f4957d7 configure: use use_pkg_config() instead of check_pkg_config() for libsmbclient 
This ensures that the CFLAGS and LDFLAGS are actually applied.
Fixes an incorrect change introduced with the clean-up in commit
cfcaf6b38e.

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-09 00:57:49 +01:00
Michael Niedermayer
885e74622e Merge commit 'e2e07dbaab' 
* commit 'e2e07dbaab':
  mov: expand the list of parsed metadata tags

Conflicts:
	libavformat/mov.c

See: 543f3db978
See: dadf668df2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-08 23:16:43 +01:00
Lukasz Marek
4acc717a05 fate: add libavcodec/options-test 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-12-08 23:14:29 +01:00
Lukasz Marek
72732307d9 lavc/options: add test for avcodec_copy_context 
This test doesn't cover every possible issue with this function.
It covers options management only.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-12-08 23:14:29 +01:00
Michael Niedermayer
0dcebe2620 Merge commit 'b704b648f9' 
* commit 'b704b648f9':
  mov: parse XMP metadata on demand

Conflicts:
	libavformat/isom.h
	libavformat/version.h

See: 054c506e3d

The default is left unchanged at enabled
We can change the default if people prefer but i do not want to do that
in a merge.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-08 22:59:16 +01:00
Michael Niedermayer
420aebf0c5 Merge commit '174c5fde90' 
* commit '174c5fde90':
  mov: parse @PRM and @PRQ metadata tags

Conflicts:
	libavformat/mov.c

See: f540851ce3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-08 22:14:29 +01:00
Michael Niedermayer
82f0f0482e Merge commit '35384934d6' 
* commit '35384934d6':
  mov: cosmetics: reorder the list of tags

Conflicts:
	libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-08 21:59:08 +01:00
Michael Niedermayer
74622ad320 Merge commit '6fd91fa119' 
* commit '6fd91fa119':
  h264: increase MAX_SLICES to 32

The available sample decodes correctly before, but the reporter of the bug
claims that this change reduces artifacts. This is thus merged
If someone has samples that decode differently depending in the MAX_SLICES
value, please open a ticket on trac.
Also this change should be reverted if it turns out that the artifacts
that where seen had a different cause

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-08 21:48:36 +01:00
Michael Niedermayer
6b4cbfec75 Merge commit 'd0b224054f' 
* commit 'd0b224054f':
  vf_frei0r: do not increment string if it reached the end

See: 02a6ee5168
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-08 21:05:59 +01:00
Michael Niedermayer
879ea06bc5 Merge commit '90411b333d' 
* commit '90411b333d':
  Allow reading of growing avi files (currently being written)

Conflicts:
	libavformat/avidec.c
	tests/ref/fate/cvid-partial

See: e42a3dd123
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-08 21:04:30 +01:00
Michael Niedermayer
c9128c2c83 Merge commit '4843a9c74f' 
* commit '4843a9c74f':
  dpx: always write the image offset

Conflicts:
	libavcodec/dpxenc.c
	tests/ref/lavf/dpx

See: 361319d0f4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-08 20:53:19 +01:00
Michael Niedermayer
3cfe1d9b3e Merge commit '250e077ee9' 
* commit '250e077ee9':
  riff: Support decoding png in avi (ImageJ)

See: 3668168afa
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-08 20:37:49 +01:00
Michael Niedermayer
82a60de3b7 avcodec/pngdec: handle 4 more bytes with SIMD for RGB64 in paeth prediction 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-08 18:24:58 +01:00
Michael Niedermayer
ed9be7dd47 avcodec/x86/pngdsp: fix off by 1 error 
This fixes artifacts in the last pixel of rows with some widths and pixel formats

Found-by: Dominique Leroux <Dominique.Leroux@autodesk.com>
Tested-by: Dominique Leroux <Dominique.Leroux@autodesk.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-08 18:24:40 +01:00
Michael Niedermayer
41a52740d4 avutil/opt: Fix AV_OPT_TYPE_BINARY case in av_opt_is_set_to_default() 
Fixes CID1257010

Reviewed-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-08 15:39:17 +01:00
Dave Rice
3c01039e0b mov: further expand the list of parsed metadata tags 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-12-08 14:28:16 +00:00
Vittorio Giovara
e2e07dbaab mov: expand the list of parsed metadata tags 
Based on L-Smash code by Yusuke Nakamura <muken.the.vfrmaniac@gmail.com>.
 2014-12-08 14:28:09 +00:00
Rong Yan
9bd8f2cc32 avcodec/ppc/vp3dsp_altivec: POWER LE support to vp3_idct_add_altivec() 
add GET_VDST16() macro

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-08 15:19:12 +01:00
Vittorio Giovara
b704b648f9 mov: parse XMP metadata on demand 
The Extensible Metadata Platform tag can contain various kind of data
which are not strictly related to the video file, such as history of edits
and saves from the project file. So display XMP metadata only when the
user explicitly requires it.

Based on a patch by Marek Fort <marek.fort@chyronhego.com>.
 2014-12-08 13:53:30 +00:00
Vittorio Giovara
174c5fde90 mov: parse @PRM and @PRQ metadata tags 
These tags describe the product and quicktime library version respectively.
They originate from Adobe Premiere, but also some other programs use them.
Contrary to other tags, they contain 'raw' data which is not to be
interpreted as iso639 or mac strings.

Based on a patch by Peter Ross <pross@xvid.org>.
 2014-12-08 13:53:20 +00:00
Vittorio Giovara
35384934d6 mov: cosmetics: reorder the list of tags 
Alphabetically order the list by the tag to facilitate the insertion of
new ones.
 2014-12-08 13:53:10 +00:00
Vittorio Giovara
6fd91fa119 h264: increase MAX_SLICES to 32 
H264 streams from CounterPath Bria and some Cisco phones need an
increased pool for correct decoding.

Bug-Id: 645
Sample-Id: bria-h264.mka
 2014-12-08 13:30:38 +00:00