]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Sat, 13 Dec 2014 15:38:44 +0000 (16:38 +0100)]
avfilter/vf_uspp: fix used pix_fmt
Found-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 13 Dec 2014 14:15:07 +0000 (15:15 +0100)]
avcodec/dvdsubdec: Avoid strerror() due to thread saftey
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 13 Dec 2014 14:12:37 +0000 (15:12 +0100)]
avcodec/libxvid_rc: Avoid strerror() for thread saftey
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 13 Dec 2014 14:06:19 +0000 (15:06 +0100)]
avformat/mov: Simplify code by using OFFSET() and FLAGS macros
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 13 Dec 2014 12:54:16 +0000 (13:54 +0100)]
avfilter/vf_kerndeint: use av_freep(), avoid leaving stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 13 Dec 2014 12:53:53 +0000 (13:53 +0100)]
avfilter/vf_unsharp: use av_freep() avoid leaving stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 13 Dec 2014 04:33:19 +0000 (05:33 +0100)]
avfilter/vf_uspp: Add grayscale support
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 13 Dec 2014 04:30:39 +0000 (05:30 +0100)]
avfilter/vf_uspp: assert that the qp_type is valid
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Lou Logan [Thu, 11 Dec 2014 20:46:54 +0000 (11:46 -0900)]
doc: add FFREPORT example
And fix a few nits.
Signed-off-by: Lou Logan <lou@lrcd.com>
wm4 [Fri, 12 Dec 2014 17:15:39 +0000 (18:15 +0100)]
lavu/dict: check for malloc failures
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
wm4 [Fri, 12 Dec 2014 21:22:55 +0000 (22:22 +0100)]
avformat/utils: check for malloc failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
wm4 [Fri, 12 Dec 2014 17:15:42 +0000 (18:15 +0100)]
lavc/avpacket: check for malloc failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Arwa Arif [Fri, 12 Dec 2014 05:44:26 +0000 (11:14 +0530)]
Delete mp=uspp
Michael Niedermayer [Fri, 12 Dec 2014 17:14:15 +0000 (18:14 +0100)]
avfilter/vf_spp: The qp array width is qp_stride not stride/16
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 12 Dec 2014 17:13:13 +0000 (18:13 +0100)]
avfilter/vf_spp: Allocate qp storage after qp_stride is known
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 12 Dec 2014 13:46:46 +0000 (14:46 +0100)]
avdevice/v4l2: use av_freep() to avoid leaving stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 12 Dec 2014 12:34:18 +0000 (13:34 +0100)]
avfilter/vf_spp: change temporary to unsigned
More consistent with uspp and allows for future 10bit support
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 12 Dec 2014 03:28:34 +0000 (04:28 +0100)]
avfilter/vf_uspp: fix integer overflow in intermediate
Fixes Ticket3596
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 12 Dec 2014 00:50:03 +0000 (01:50 +0100)]
avfilter/vf_uspp: remove YUV 411/422/440
snow doesnt support 422/411/440 currently, so these do not work yet
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 12 Dec 2014 00:47:46 +0000 (01:47 +0100)]
avfilter/vf_uspp: use the average QP instead of QP[0]
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 12 Dec 2014 00:41:33 +0000 (01:41 +0100)]
avfilter/vf_uspp: The qp array width is qp_stride not stride/16
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 12 Dec 2014 00:40:26 +0000 (01:40 +0100)]
avfilter/vf_uspp: Allocate qp storage after qp_stride is known
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 12 Dec 2014 00:30:45 +0000 (01:30 +0100)]
avfilter/version: bump for uspp
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Fri, 12 Dec 2014 00:46:45 +0000 (01:46 +0100)]
LICENSE: mention that uspp is GPL
Clément Bœsch [Fri, 12 Dec 2014 00:45:49 +0000 (01:45 +0100)]
build: add forgotten avcodec dependency in uspp
Clément Bœsch [Fri, 12 Dec 2014 00:52:02 +0000 (01:52 +0100)]
avfilter/uspp: use AVFILTER_DEFINE_CLASS()
Clément Bœsch [Fri, 12 Dec 2014 00:45:29 +0000 (01:45 +0100)]
avfilter/uspp: make src const in store_slice_c()
Clément Bœsch [Fri, 12 Dec 2014 00:40:55 +0000 (01:40 +0100)]
avfilter/uspp: misc style fixes
Arwa Arif [Sun, 7 Dec 2014 13:26:46 +0000 (18:56 +0530)]
lavfi: USPP Filter
Previous version reviewed by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 9 Dec 2014 01:57:01 +0000 (02:57 +0100)]
avformat/mov: Disable XMP metadata by default
This was suggested by cbsrobot, ubitux and koda
There are files with huge amounts of XMP data, which would otherwise
be displayed in the terminal output of FFmpeg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Dec 2014 12:55:26 +0000 (13:55 +0100)]
avcodec/libutvideoenc: Check avpicture_get_size() return code
Fixes CID1257656
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Dec 2014 14:44:05 +0000 (15:44 +0100)]
avcodec/libutvideoenc: fix leak of info array on error
Fixes CID1257657
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Dec 2014 15:12:47 +0000 (16:12 +0100)]
compat/avisynth/avxsynth_c: Clear all unused fields in returned structs
Fixes: CID1257658
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Gabor Nagy [Thu, 11 Dec 2014 13:59:10 +0000 (14:59 +0100)]
avformat/avidec: Do not fail for crazy start times
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Dec 2014 12:25:10 +0000 (13:25 +0100)]
avcodec/libxavs: fix division by 0 bitrate
Fixes CID1257655
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 10 Dec 2014 06:48:52 +0000 (07:48 +0100)]
avcodec/x86/hevc_mc: fix sse register counts
These fix failures of --enable-xmm-clobber-test
It would be better to change the code to use fewer registers, but until
someone does the used register count must not be too small
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Dec 2014 02:47:53 +0000 (03:47 +0100)]
configure: do not allow nvenc to be build on cygwin to avoid _WIN32 definition hack
Suggested-by: James Almer <jamrial@gmail.com>
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Dec 2014 01:58:41 +0000 (02:58 +0100)]
avcodec/hevc: Silence "warning: ref0/1 may be used uninitialized in this function"
Also make code more robust by initializing the pointers to NULL
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Lou Logan [Fri, 5 Dec 2014 21:32:35 +0000 (12:32 -0900)]
doc: add loglevel numerical values
Useful for setting FFREPORT log level.
Signed-off-by: Lou Logan <lou@lrcd.com>
Michael Niedermayer [Thu, 11 Dec 2014 01:03:08 +0000 (02:03 +0100)]
Merge commit '
e737a4aaafcb1d761b7f96043c2f83ce742c64ae '
* commit '
e737a4aaafcb1d761b7f96043c2f83ce742c64ae ':
dashenc: Change the duration fields to 64 bit
Conflicts:
libavformat/dashenc.c
See:
e65849a70bfb401306038d41ebd8b5750deb3cfd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Dec 2014 00:44:04 +0000 (01:44 +0100)]
Merge commit '
c7921a480467876ece06566e0efd8f6bce9d1903 '
* commit '
c7921a480467876ece06566e0efd8f6bce9d1903 ':
libfdk-aacdec: Fix a boundary check
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Timo Rothenpieler [Sat, 29 Nov 2014 23:04:37 +0000 (00:04 +0100)]
avcodec: Add NVENC encoder
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christian Suloway [Mon, 8 Dec 2014 16:25:05 +0000 (10:25 -0600)]
avformat/hlsenc: added segment file deletion
This option flag deletes segment files removed from the playlist after a
period of time equal to the duration of the segment plus the duration of
the playlist.
Signed-off-by: Christian Suloway <csuloway@globaleagleent.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Wed, 10 Dec 2014 06:08:59 +0000 (08:08 +0200)]
dashenc: Change the duration fields to 64 bit
For the last_duration field, it's mostly theoretical, but the
total_duration field more probably may need to actually be 64 bit.
Bug-Id: CID
1254944
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 10 Dec 2014 06:02:43 +0000 (08:02 +0200)]
libfdk-aacdec: Fix a boundary check
This avoids potential out of bounds writes, with potential future
versions of the library.
Bug-Id: CID
1254945
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Wed, 10 Dec 2014 13:34:46 +0000 (14:34 +0100)]
avcodec/hevc_refs: fix potential use of uninitialized min_idx
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 10 Dec 2014 13:02:18 +0000 (14:02 +0100)]
avformat/yuv4mpegdec: fix "warning: field_order may be used uninitialized in this function"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 10 Dec 2014 12:30:51 +0000 (13:30 +0100)]
avformat/flvdec: fix potential use of uninitialized variables
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 10 Dec 2014 12:26:46 +0000 (13:26 +0100)]
avfilter/vf_perspective: add av_assert0() to help gcc see that there are no uninitialized variables
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 10 Dec 2014 11:20:23 +0000 (12:20 +0100)]
Merge commit '
2c3f29c4894ee50635b846f202296ad79a7c0d33 '
* commit '
2c3f29c4894ee50635b846f202296ad79a7c0d33 ':
xcbgrab: Support empty filename string correctly
Conflicts:
libavdevice/xcbgrab.c
See:
62eca2f827d441f52125191fd78c96b67a7ba30c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 10 Dec 2014 06:34:49 +0000 (07:34 +0100)]
avcodec/x86/hevc_mc: remove dead branch from EPEL_FILTER
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Gabor Nagy [Wed, 10 Dec 2014 01:59:25 +0000 (02:59 +0100)]
avformat/avidec: Increase dshow_block_align use threshold by 1
Fixes 00.avi
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Wed, 26 Nov 2014 05:20:52 +0000 (06:20 +0100)]
xcbgrab: Support empty filename string correctly
Bug-Id: CID
1254664
CC: libav-stable@libav.org
Michael Niedermayer [Wed, 10 Dec 2014 00:24:36 +0000 (01:24 +0100)]
Merge commit '
fa8934d6d6a0bb290010bdf16265c40b331d56fb '
* commit '
fa8934d6d6a0bb290010bdf16265c40b331d56fb ':
dashenc: log file output progress in verbose mode
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 10 Dec 2014 00:16:31 +0000 (01:16 +0100)]
Merge commit '
95d880fa6436f3b557a9c060428a04b9e4d552df '
* commit '
95d880fa6436f3b557a9c060428a04b9e4d552df ':
rtpproto: Fix the input RTP data format check
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 9 Dec 2014 23:58:13 +0000 (00:58 +0100)]
Merge commit '
d2f1d42b18787e4fcb28864d9d9f701dd64a5747 '
* commit '
d2f1d42b18787e4fcb28864d9d9f701dd64a5747 ':
fate: add dolby true hd tests
Conflicts:
tests/fate/lossless-audio.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 9 Dec 2014 23:51:15 +0000 (00:51 +0100)]
Merge commit '
4c81613df499ba81d64ea102b38d0c6686cc304c '
* commit '
4c81613df499ba81d64ea102b38d0c6686cc304c ':
arm: mlpdsp: handle pic offset calculation in a macro
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 9 Dec 2014 23:38:52 +0000 (00:38 +0100)]
Merge commit '
581c7f0e12b1fa39f73d683e54d6ecda0772c5a9 '
* commit '
581c7f0e12b1fa39f73d683e54d6ecda0772c5a9 ':
arm: make ff_mlp_filter_channel_arm and ff_mlp_rematrix_channel_arm position independent
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Bryan Huh [Tue, 9 Dec 2014 08:11:23 +0000 (08:11 +0000)]
dashenc: log file output progress in verbose mode
As the manifest/segments are flushed to disk, log to stderr the
progress, when in verbose logging mode
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 9 Dec 2014 14:05:14 +0000 (16:05 +0200)]
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>
Carl Eugen Hoyos [Tue, 9 Dec 2014 20:12:54 +0000 (21:12 +0100)]
Allow mov musing if the ac3 parser was disabled.
This reverts
8091fe30 .
Reported and tested by Takashi, ffmpeg-list dubistmeinheld de
Janne Grunau [Mon, 8 Dec 2014 15:21:43 +0000 (16:21 +0100)]
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.
Janne Grunau [Mon, 8 Dec 2014 13:10:18 +0000 (14:10 +0100)]
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.
Janne Grunau [Mon, 8 Dec 2014 12:25:55 +0000 (13:25 +0100)]
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.
Michael Niedermayer [Tue, 9 Dec 2014 20:04:49 +0000 (21:04 +0100)]
Merge commit '
fccfc22d1f304aef42a0b960e4c1d55ce67107f5 '
* commit '
fccfc22d1f304aef42a0b960e4c1d55ce67107f5 ':
libavformat: Build hevc.o when building the RTP muxer
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 9 Dec 2014 18:58:56 +0000 (19:58 +0100)]
avformat/crypto: fix key vs iv typo
Fixes Ticket 4167
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 9 Dec 2014 16:57:35 +0000 (17:57 +0100)]
avformat/utils: change assert to av_assert0()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 9 Dec 2014 16:53:30 +0000 (17:53 +0100)]
avformat/utils: replace impossible condition by av_assert0() in ff_gen_search()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 9 Dec 2014 15:10:55 +0000 (16:10 +0100)]
avformat/wavenc: check return value of strftime()
Fixes CID1257006
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Tue, 9 Dec 2014 10:13:54 +0000 (12:13 +0200)]
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>
Michael Niedermayer [Tue, 9 Dec 2014 11:08:24 +0000 (12:08 +0100)]
Merge commit '
780cd20b00a69e26bbfffbb8eec16fbe999ea793 '
* commit '
780cd20b00a69e26bbfffbb8eec16fbe999ea793 ':
aarch64: Use .data.rel.ro for const data with relocations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 9 Dec 2014 10:58:13 +0000 (11:58 +0100)]
Merge commit '
f963f80399deb1a2b44c1bac3af7123e8a0c9e46 '
* commit '
f963f80399deb1a2b44c1bac3af7123e8a0c9e46 ':
arm: Use .data.rel.ro for const data with relocations
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 9 Dec 2014 10:48:27 +0000 (11:48 +0100)]
Merge commit '
3c01039e0bc7d269900e15551f8171c4328a0223 '
* commit '
3c01039e0bc7d269900e15551f8171c4328a0223 ':
mov: further expand the list of parsed metadata tags
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Sun, 16 Nov 2014 10:52:21 +0000 (12:52 +0200)]
aarch64: Use .data.rel.ro for const data with relocations
This reverts commit
c00365b46d464ce47716315c1801818d811bdb9a
in addition to using a different section.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sun, 16 Nov 2014 10:51:54 +0000 (12:51 +0200)]
arm: Use .data.rel.ro for const data with relocations
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Tue, 9 Dec 2014 04:31:30 +0000 (05:31 +0100)]
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>
Reynaldo H. Verdejo Pinochet [Mon, 8 Dec 2014 21:32:22 +0000 (18:32 -0300)]
ffserver_config: reflow add_codec()
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
Reynaldo H. Verdejo Pinochet [Mon, 8 Dec 2014 20:25:35 +0000 (17:25 -0300)]
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>
Reynaldo H. Verdejo Pinochet [Mon, 8 Dec 2014 17:12:36 +0000 (14:12 -0300)]
ffserver_config: improve error/warning messages
Fix grammar and quote user-supplied values.
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
Reynaldo H. Verdejo Pinochet [Mon, 8 Dec 2014 15:42:39 +0000 (12:42 -0300)]
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>
Michael Niedermayer [Tue, 9 Dec 2014 02:34:20 +0000 (03:34 +0100)]
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>
Michael Niedermayer [Tue, 9 Dec 2014 02:33:44 +0000 (03:33 +0100)]
avformat/utils: Pass the next pts/dts to compute_pkt_fields() when available
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 9 Dec 2014 00:54:51 +0000 (01:54 +0100)]
avdevice/xcbgrab: check xcb_query_pointer_reply_t pointer before use
Fixes CID1254668
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Moritz Barsnick [Mon, 8 Dec 2014 15:08:20 +0000 (16:08 +0100)]
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
cfcaf6b38e39ed6e788abb1a5a44f23660dce2f6 .
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 8 Dec 2014 22:01:42 +0000 (23:01 +0100)]
Merge commit '
e2e07dbaab1f17e995842b7eacec4665d44c3d14 '
* commit '
e2e07dbaab1f17e995842b7eacec4665d44c3d14 ':
mov: expand the list of parsed metadata tags
Conflicts:
libavformat/mov.c
See:
543f3db9784348499a1ac1088373e2fb9100d4c0
See:
dadf668df20e041b330fa4d3c5feb32a3f495d32
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Lukasz Marek [Wed, 3 Dec 2014 23:28:52 +0000 (00:28 +0100)]
fate: add libavcodec/options-test
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Lukasz Marek [Wed, 3 Dec 2014 23:06:40 +0000 (00:06 +0100)]
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>
Michael Niedermayer [Mon, 8 Dec 2014 21:33:38 +0000 (22:33 +0100)]
Merge commit '
b704b648f9ecb830874627db958a37e004107d1b '
* commit '
b704b648f9ecb830874627db958a37e004107d1b ':
mov: parse XMP metadata on demand
Conflicts:
libavformat/isom.h
libavformat/version.h
See:
054c506e3da35471ea92dbedcaaf720d0754f04e
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>
Michael Niedermayer [Mon, 8 Dec 2014 21:13:23 +0000 (22:13 +0100)]
Merge commit '
174c5fde90060faab67796a5eaef742630f1db6e '
* commit '
174c5fde90060faab67796a5eaef742630f1db6e ':
mov: parse @PRM and @PRQ metadata tags
Conflicts:
libavformat/mov.c
See:
f540851ce320bc69621ea70b89857c54129c82c2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 8 Dec 2014 20:59:08 +0000 (21:59 +0100)]
Merge commit '
35384934d6e27e0334060a23a0c83a3cb5cef198 '
* commit '
35384934d6e27e0334060a23a0c83a3cb5cef198 ':
mov: cosmetics: reorder the list of tags
Conflicts:
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 8 Dec 2014 20:38:07 +0000 (21:38 +0100)]
Merge commit '
6fd91fa11909f27902498648680dbb3d13f1f175 '
* commit '
6fd91fa11909f27902498648680dbb3d13f1f175 ':
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>
Michael Niedermayer [Mon, 8 Dec 2014 20:04:58 +0000 (21:04 +0100)]
Merge commit '
d0b224054f13bf57244694a3ff092cfef68d66f9 '
* commit '
d0b224054f13bf57244694a3ff092cfef68d66f9 ':
vf_frei0r: do not increment string if it reached the end
See:
02a6ee51685eb74f7a878dd49553ecc1f8da9fb2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 8 Dec 2014 20:02:42 +0000 (21:02 +0100)]
Merge commit '
90411b333d6b6bb69d8937117b9250785730dc53 '
* commit '
90411b333d6b6bb69d8937117b9250785730dc53 ':
Allow reading of growing avi files (currently being written)
Conflicts:
libavformat/avidec.c
tests/ref/fate/cvid-partial
See:
e42a3dd123c47efd7921f93d4a1f6f53c196ad4a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 8 Dec 2014 19:53:19 +0000 (20:53 +0100)]
Merge commit '
4843a9c74f77f5eb8d2b1ee648fe2ac6e2a48ec3 '
* commit '
4843a9c74f77f5eb8d2b1ee648fe2ac6e2a48ec3 ':
dpx: always write the image offset
Conflicts:
libavcodec/dpxenc.c
tests/ref/lavf/dpx
See:
361319d0f49475bc14c744194870f9bab78a8a83
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 8 Dec 2014 19:35:16 +0000 (20:35 +0100)]
Merge commit '
250e077ee9eec0176a6d54a78542dc792943e71a '
* commit '
250e077ee9eec0176a6d54a78542dc792943e71a ':
riff: Support decoding png in avi (ImageJ)
See:
3668168afa1ef73928b2c6cc2a6ffa8e8ad82312
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 7 Dec 2014 11:36:10 +0000 (12:36 +0100)]
avcodec/pngdec: handle 4 more bytes with SIMD for RGB64 in paeth prediction
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 7 Dec 2014 11:28:37 +0000 (12:28 +0100)]
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>
Michael Niedermayer [Sun, 7 Dec 2014 18:53:18 +0000 (19:53 +0100)]
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>
Dave Rice [Fri, 28 Nov 2014 23:44:06 +0000 (23:44 +0000)]
mov: further expand the list of parsed metadata tags
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Vittorio Giovara [Fri, 28 Nov 2014 23:25:20 +0000 (23:25 +0000)]
mov: expand the list of parsed metadata tags
Based on L-Smash code by Yusuke Nakamura <muken.the.vfrmaniac@gmail.com>.