OSDN Git Service
Michael Niedermayer [Mon, 21 Oct 2013 17:21:10 +0000 (19:21 +0200)]
Merge commit '
23e6d3d4e27c83e06d00aa072c84d057bd1dad23'
* commit '
23e6d3d4e27c83e06d00aa072c84d057bd1dad23':
fate: vpx: Remove one redundant $(eval) invocation
Merge for meta data only as this breaks the affected fate tests
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 21 Oct 2013 14:21:14 +0000 (16:21 +0200)]
avfilter/ff_insert_pad: fix order of operations
Fixes out of bounds access
Fixes CID732170
Fixes CID732169
No filter is known to use this function in a way so the issue can be reproduced.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Tue, 8 Oct 2013 14:48:52 +0000 (14:48 +0000)]
make it possible to compile ffmpeg without swscale
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 18 Oct 2013 10:44:56 +0000 (10:44 +0000)]
avformat/mxfdec; parse random index pack to get last partition offset and use it when footer partition offset is missing
Footer partition may not be present and even if present footer partition
offset may not be set in any partition except last one.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Mon, 21 Oct 2013 11:52:47 +0000 (13:52 +0200)]
fate: enable hevc tests
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Mon, 21 Oct 2013 11:49:30 +0000 (13:49 +0200)]
Support FF_DISABLE_DEPRECATION_WARNINGS with icc on Linux.
Stefano Sabatini [Mon, 21 Oct 2013 11:33:06 +0000 (13:33 +0200)]
ffprobe: fix consistency checks in parse_read_intervals()
Move array size assert after the count increment, and avoid strchr() NULL
dereference on p.
Should fix FFmpeg coverity issue #
1108581.
Mickaël Raulet [Sun, 20 Oct 2013 20:40:39 +0000 (22:40 +0200)]
avcodec/hevc: fix duplicate/wrong nal unit check and difference to openhevc_upstream
NAL_BLA_W_RADL instead of NAL_BLA_N_LP
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 17 Oct 2013 22:21:36 +0000 (00:21 +0200)]
fate: add synthetic swresample resampling tests
this is based on libavresample.mak
These tests do not depend on external samples
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Sun, 20 Oct 2013 19:23:43 +0000 (21:23 +0200)]
avformat/vobsub: fix invalid sub queue access while seeking.
If there is only 1 stream and seek isn't called with a specific stream
index, we pick the first (and only) one.
Regression since
dbfe6110.
Fixes CID1108591.
Ronald S. Bultje [Sun, 20 Oct 2013 19:05:28 +0000 (21:05 +0200)]
avcodec/vp9dsp: fix overwrite by 1 in vert_left pred.
The memset following the memcpy was silencing the problem since
re-writing that same byte.
Fixes CID1108597, CID1108598, (16x16)
CID1108599, CID1108600, (8x8)
CID1108601, CID1108602 (32x32)
Signed-off-by: Clément Bœsch <u@pkh.me>
Marton Balint [Sun, 20 Oct 2013 16:24:55 +0000 (18:24 +0200)]
lavc: make avcodec_decode_subtitle2 more robust
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Lukasz Marek [Sat, 19 Oct 2013 19:38:40 +0000 (21:38 +0200)]
MAINTAINERS: add lavd/fbdev_enc entry
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Lukasz Marek [Fri, 18 Oct 2013 21:41:20 +0000 (23:41 +0200)]
lavd/pulse_audio_enc: add support for flushing
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Michael Niedermayer [Sun, 20 Oct 2013 16:38:48 +0000 (18:38 +0200)]
avutil/opt: initialize ret
Fixes CID1108610
Fixes use of uninitialized variable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 20 Oct 2013 16:36:09 +0000 (18:36 +0200)]
avutil/file_open: Print debug message if setting close on exec fails
Fixes CID1087079
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 20 Oct 2013 16:33:53 +0000 (18:33 +0200)]
avformat/utils: Check av_packet_new_side_data() return before using it
Fixes null pointer dereference
Fixes CID1108592
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 20 Oct 2013 14:57:45 +0000 (16:57 +0200)]
avformat/oggparsespeex: Check for extradata allocation failure
Fixes CID1108574
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 20 Oct 2013 14:55:43 +0000 (16:55 +0200)]
avformat/oggparseflac: check ff_alloc_extradata() return code
Fixes CID1108573
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 20 Oct 2013 14:38:20 +0000 (16:38 +0200)]
avformat/oggparsecelt/celt_header: fix memleak
Fixes: CID1108605
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 20 Oct 2013 14:34:32 +0000 (16:34 +0200)]
avformat/network: check for fcntl() failure in ff_socket()
Fixes: CID1087075
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 20 Oct 2013 12:33:05 +0000 (14:33 +0200)]
avformat/au: add assert to help source code analyzers
See: CID1108585 and CID1108603
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 20 Oct 2013 12:09:55 +0000 (14:09 +0200)]
avcodec/vp9: Add asserts to help source code analyzers
See CID1108596 and CID1108595
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reimar Döffinger [Thu, 17 Oct 2013 19:01:44 +0000 (21:01 +0200)]
hevc: Initialize sample aspect to valid value.
Without this, it is 0/0 by default, which is not allowed.
This sets it to 0/1, which means "undefined".
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Mickaël Raulet [Sat, 19 Oct 2013 15:04:44 +0000 (17:04 +0200)]
hevc: pretty print(cherry picked from commit
64a4b623b7d66dfc0f3883e5f1d9125c00c3b18c)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mickaël Raulet [Sat, 19 Oct 2013 15:03:59 +0000 (17:03 +0200)]
hevc: fix PPS_A_qualcomm_7(cherry picked from commit
2af177a8761c88eb477a658eebcf4264068aa773)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 Oct 2013 23:58:51 +0000 (01:58 +0200)]
avcodec/wavpackenc: fix uninitialized ret
Fixes CID1108609
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 Oct 2013 23:50:34 +0000 (01:50 +0200)]
avcodec/tiff: remove byte based bpp special case
This case does not work as off is uninitialized and it should be
handled fine by the generic code below
Fixes CID1108608
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 Oct 2013 22:41:00 +0000 (00:41 +0200)]
avcodec/hevc_refs: fix h/vshift calculation in ff_hevc_output_frame()
Fixes CID1108577
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 Oct 2013 22:35:18 +0000 (00:35 +0200)]
avcodec/hevc: do not dereference pointer before null check in verify_md5()
Fixes: CID1108607
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 Oct 2013 22:33:29 +0000 (00:33 +0200)]
avcodec/hevc_cabac: trivial simplifications
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mickaël Raulet [Fri, 18 Oct 2013 18:01:29 +0000 (20:01 +0200)]
hevc: inline cabac in hls_mvd_coding(cherry picked from commit
ad387195ad04e8a005a1bfd509e9e4f827e68fa9)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mickaël Raulet [Fri, 18 Oct 2013 14:16:48 +0000 (16:16 +0200)]
hevc: inline cabac in residual coding(cherry picked from commit
17d7a880445b72feb36d684ae1f0597195811e97)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 Oct 2013 22:23:48 +0000 (00:23 +0200)]
avcodec/hevc: fix EOB/EOS check
Fixes: CID1108575
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 Oct 2013 21:44:34 +0000 (23:44 +0200)]
avcodec/h264_parser: fix order of operations
Fixes CID1108576
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 Oct 2013 21:36:35 +0000 (23:36 +0200)]
ffv1enc: use 64bit in maxsize calculation
This isnt needed but it cant hurt, its also more consistent with
how its calculated a few lines before.
See: CID1108593
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 Oct 2013 21:28:08 +0000 (23:28 +0200)]
avcodec/exr: fix null pointer dereference
Fixes CID1108582
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 Oct 2013 21:27:36 +0000 (23:27 +0200)]
avcodec/exr: favor av_freep() over av_free() for saftey
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 Oct 2013 20:50:16 +0000 (22:50 +0200)]
avformat/oggdec: favor av_freep() over av_free()
Found-by: Reimar Döffinger
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 Oct 2013 15:52:47 +0000 (17:52 +0200)]
avcodec/utils: add some saftey checks to add_metadata_from_side_data()
This fixes potential overreads with crafted files.
Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 Oct 2013 15:45:54 +0000 (17:45 +0200)]
avcodec/avpacket/av_packet_split_side_data: ensure that side data padding is initialized
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 15 Sep 2013 13:25:09 +0000 (15:25 +0200)]
Do not leave positive values undefined when negative are defined as error
Define positive return values as non errors and leave further meaning undefined
This allows future extensions to use these values
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 11 Oct 2013 21:02:46 +0000 (23:02 +0200)]
doc/developer: Add a policy item about updating the MAINTAINERs file
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Wed, 16 Oct 2013 14:42:24 +0000 (16:42 +0200)]
fate: vpx: Remove one redundant $(eval) invocation
Michael Niedermayer [Sat, 19 Oct 2013 09:15:07 +0000 (11:15 +0200)]
avformat/wtvdec: drop SHIFT_SECTOR_BITS() macro
it just wraps around a bitwise shift, and makes the code harder to read
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 Oct 2013 09:01:59 +0000 (11:01 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
wtv: Seek by sector properly
Conflicts:
libavformat/wtvdec.c
See:
a0d13d84a928110b0e99ea16d17fd758fcbde35f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 Oct 2013 08:58:17 +0000 (10:58 +0200)]
avformat/wtv: rename to wtv_common
This helps git matchup files on merges correctly
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 18 Oct 2013 22:49:54 +0000 (00:49 +0200)]
MAINTAINERS: add Timothy to documentation
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
俞晓磊 [Fri, 18 Oct 2013 22:07:31 +0000 (00:07 +0200)]
configure: remove \r from cc_ident,
This should fix cygwin + non-cygwin toolchain
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Lukasz Marek [Fri, 18 Oct 2013 21:41:19 +0000 (23:41 +0200)]
lavd/pulse_audio_enc: fix error check
Error check should be done by checking negative value, not non-zero.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Stefano Sabatini [Fri, 18 Oct 2013 21:38:54 +0000 (23:38 +0200)]
lavd/fbdev: use av_str2err() macro for printing error messages
In particular fix wrong strerror(ret) with a negative value, and avoid
the use of non thread-safe strerror().
Lukasz Marek [Fri, 18 Oct 2013 20:12:15 +0000 (22:12 +0200)]
lavd/pulse_audio_dec: apply cosmetic changes
In particular, fix punctuation in docs and make option help messages
grammatically consistent.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Lukasz Marek [Fri, 18 Oct 2013 18:45:13 +0000 (20:45 +0200)]
lavd/fbdev: pass proper memory map length
fbdev->data was allocated with size fbdev->fixinfo.smem_len, release data
in fbdev_read_close() using the same size.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Stefano Sabatini [Fri, 18 Oct 2013 11:06:17 +0000 (13:06 +0200)]
MAINTAINERS: add my name to a few entries
Carl Eugen Hoyos [Fri, 18 Oct 2013 17:53:47 +0000 (19:53 +0200)]
Fix decoding of G.726 in AIFF.
Fixes ticket #1973.
Carl Eugen Hoyos [Fri, 18 Oct 2013 17:35:03 +0000 (19:35 +0200)]
lavf/riff: Fix a comment.
FourCC aivx refers to (Sony) XAVC, not (Panasonic) AVC-Intra.
Spotted by Kieran Kunhya and Vincent Olivier.
Carl Eugen Hoyos [Thu, 11 Jul 2013 12:06:20 +0000 (14:06 +0200)]
avformat: Use G726LE decoder for Sun AU files
fixes ticket #1955 as suggested by Roman.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Thu, 11 Jul 2013 12:06:20 +0000 (14:06 +0200)]
avcodec: Add little-endian G726 decoder
Fixes part of Ticket1955
suggested by Roman.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Fri, 18 Oct 2013 05:50:50 +0000 (07:50 +0200)]
Support 4k AVC-Intra in mov.
Luca Barbato [Fri, 18 Oct 2013 11:45:13 +0000 (13:45 +0200)]
wtv: Seek by sector properly
Use an helper function to seek by sector to avoid possible mistakes
due shifting by WTV_SECTOR_BITS a 32bit integer.
Contrary to common intuition, a 32 bit integer left shifted
by a 64 bit integer does not promote the 32 bit integer to
64 bit before shifting.
Paul B Mahol [Fri, 18 Oct 2013 09:55:16 +0000 (09:55 +0000)]
avformat/flvdec: use avpriv_request_sample()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Clément Bœsch [Thu, 17 Oct 2013 19:25:14 +0000 (21:25 +0200)]
avcodec/hevcpred: fix make checkheaders.
Michael Niedermayer [Thu, 17 Oct 2013 18:15:18 +0000 (20:15 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: Increase the tolerance in the lavr tests
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 17 Oct 2013 17:50:19 +0000 (19:50 +0200)]
Merge commit '
f52fd3f3b26f0d80e4f0b374b7695383feca5b92'
* commit '
f52fd3f3b26f0d80e4f0b374b7695383feca5b92':
fate: aac: Add test for AAC-LD
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Mon, 14 Oct 2013 23:20:35 +0000 (01:20 +0200)]
lswr/swresample: convert ocl and icl options to AV_OPT_TYPE_CHANNEL_LAYOUT
Improve interface flexibility. In particular makes it possible to set
channel layout through symbolic names using the av_opt_set() interface.
Martin Storsjö [Thu, 17 Oct 2013 08:38:58 +0000 (11:38 +0300)]
fate: Increase the tolerance in the lavr tests
A few fate instances on OS/2, OpenBSD, FreeBSD and IA64 linux currently
still fail a few tests with a maxdiff of 6.
Signed-off-by: Martin Storsjö <martin@martin.st>
Stefano Sabatini [Fri, 4 Oct 2013 10:07:55 +0000 (12:07 +0200)]
lavu/opt: add AV_OPT_TYPE_CHANNEL_LAYOUT and handler functions
The new type is compatible with AV_OPT_TYPE_INT64, but allows to specify
channel layouts using the format accepted by av_get_channel_layout().
Stefano Sabatini [Fri, 4 Oct 2013 13:20:50 +0000 (15:20 +0200)]
lavu/channel_layout: change av_get_channel_layout() behavior at the next bump
The new syntax is preferred since it allows backward syntax compatibility
with libswr when switching to the new option handling code with
AV_OPT_TYPE_CHANNEL_LAYOUT.
With the new parser the string:
1234
is interpreted as a channel layout mask, rather than as a number of
channels, and thus it's compatible with the current way to set a channel
layout as an integer (e.g. for the icl and ocl options) making use of
integer option values.
ff_get_channel_layout() with compat=0 will be used in the
AV_OPT_TYPE_CHANNEL handler code.
The user is encouraged to switch to the new forward compatible syntax,
which requires to put a trailing "c" when specifying a layout as a number
of channels.
Stefano Sabatini [Thu, 17 Oct 2013 15:08:11 +0000 (17:08 +0200)]
lavu/opt.h: fix grammar typo in av_opt_get* doxy
Stefano Sabatini [Thu, 17 Oct 2013 14:52:02 +0000 (16:52 +0200)]
lavu/opt-test: use automatic set and free handlers
In particular, do not set default string value by hand and use
av_opt_free() to free context.
Michael Niedermayer [Thu, 17 Oct 2013 11:39:28 +0000 (13:39 +0200)]
swscale/yuv2rgb: clip cy, avoid division by 0 with 0 contrast
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 17 Oct 2013 09:18:04 +0000 (11:18 +0200)]
swscale/utils/sws_setColorspaceDetails(): fix indention
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Mon, 14 Oct 2013 21:40:05 +0000 (23:40 +0200)]
fate: aac: Add test for AAC-LD
Michael Niedermayer [Thu, 17 Oct 2013 08:42:36 +0000 (10:42 +0200)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Add some necessary casts in the wtv demuxer.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Dirk Farin [Thu, 17 Oct 2013 08:14:51 +0000 (10:14 +0200)]
avformat/hevcdec: add more irap cases to hevc_probe()
This fixes fate-hevc-conformance-RAP_A_docomo_4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Dirk Farin [Sat, 12 Oct 2013 09:55:44 +0000 (11:55 +0200)]
avformat/hevcdec: cosmetics, whitespaces
This reduces the difference to the latest hevc demuxer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Thu, 17 Oct 2013 07:51:06 +0000 (09:51 +0200)]
Add some necessary casts in the wtv demuxer.
This reverts
e8023dba, fixes ticket #3049.
Michael Niedermayer [Thu, 17 Oct 2013 06:13:12 +0000 (08:13 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mem: Make av_strdup allocate using av_realloc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Mickaël Raulet [Wed, 16 Oct 2013 14:03:57 +0000 (16:03 +0200)]
hevc: fix pcm with different chroma luma bit widths(cherry picked from commit
6a444516f338424d062c0ef2806714036283603b)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mickaël Raulet [Fri, 11 Oct 2013 20:07:00 +0000 (22:07 +0200)]
hevc: optimize residual coding(cherry picked from commit
70692a44708157b4dfa50e402e446bfa2b27f55e)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 16 Oct 2013 22:48:43 +0000 (00:48 +0200)]
avutil/log: fix race between setting and using the log callback
Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 16 Oct 2013 20:25:08 +0000 (22:25 +0200)]
doc/utils: fix docs build
Not sure this is the correct solution but that can be investigated too once
the docs build again
Tested-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Mon, 14 Oct 2013 17:42:41 +0000 (17:42 +0000)]
swsscale/swscale_unscaled: add GBRAP16
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 16 Oct 2013 18:37:09 +0000 (20:37 +0200)]
swscale/swscale_unscaled: fix alpha pointer & stride for planarRgb16ToRgb16Wrapper()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Mon, 14 Oct 2013 01:37:12 +0000 (18:37 -0700)]
doc/filters: reference ffmpeg-utils manual for color and sizes options
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Timothy Gu [Mon, 14 Oct 2013 01:37:11 +0000 (18:37 -0700)]
doc/utils: reformat doc for color syntax and add list of supported colors
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Timothy Gu [Wed, 4 Sep 2013 00:19:26 +0000 (17:19 -0700)]
doc/utils: rewrite doc for time duration syntax
Extend description and clarify syntax.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Martin Storsjö [Fri, 4 Oct 2013 21:19:13 +0000 (00:19 +0300)]
mem: Make av_strdup allocate using av_realloc
This makes sure that pointers from av_strdup are reallocable,
which is used in av_dict_set if the AV_DICT_APPEND flag is set.
Nothing should rely on pointers from av_strdup being aligned.
Signed-off-by: Martin Storsjö <martin@martin.st>
Carl Eugen Hoyos [Wed, 16 Oct 2013 02:12:27 +0000 (04:12 +0200)]
Support HEVC in transport streams.
Ronald S. Bultje [Wed, 16 Oct 2013 15:11:17 +0000 (17:11 +0200)]
avcodec/vp9: fix band_counts array size / padding
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Wed, 27 Feb 2013 19:29:39 +0000 (19:29 +0000)]
avcodec/exr: piz decompression
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Wed, 16 Oct 2013 13:08:10 +0000 (15:08 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpegvideo: Move 8x8 in a separate function
Conflicts:
libavcodec/mpegvideo_motion.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 16 Oct 2013 12:51:00 +0000 (14:51 +0200)]
Merge commit '
95587859cc69e5abe37c9e3af48008032d98e262' into HEAD
* commit '
95587859cc69e5abe37c9e3af48008032d98e262':
mpegvideo: Move obmc in a separate function
Conflicts:
libavcodec/mpegvideo_motion.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 16 Oct 2013 12:02:43 +0000 (14:02 +0200)]
Merge commit '
a90905db2e6ab1840890f3a88bfd3bf008b9d886'
* commit '
a90905db2e6ab1840890f3a88bfd3bf008b9d886':
ffv1: Assume bitdepth 0 means 8bit
Conflicts:
libavcodec/ffv1dec.c
Note, FFmpeg is not affected by this bug
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 16 Oct 2013 11:54:41 +0000 (13:54 +0200)]
Merge commit '
a84616b736fca5ebd6b87489dd41bc06ccdf7860'
* commit '
a84616b736fca5ebd6b87489dd41bc06ccdf7860':
mpegvideo: K&R formatting cosmetics
Conflicts:
libavcodec/mpegvideo_motion.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 16 Oct 2013 11:08:37 +0000 (13:08 +0200)]
Merge commit '
93f305473f880729d18b5e42067f19d2106cb2e5'
* commit '
93f305473f880729d18b5e42067f19d2106cb2e5':
lavc: Convert some remaining strides to ptrdiff_t
Conflicts:
libavcodec/h264.h
libavcodec/mpegvideo_enc.c
libavcodec/mpegvideo_motion.c
libavcodec/vp56.c
libavcodec/wmv2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 16 Oct 2013 10:51:26 +0000 (12:51 +0200)]
Merge commit '
4baba6c813b7a1f27370e20fb1a87b05fcb39208'
* commit '
4baba6c813b7a1f27370e20fb1a87b05fcb39208':
h264_parser: Fix POC parsing for the case where MMCO_RESET is present.
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 16 Oct 2013 10:38:55 +0000 (12:38 +0200)]
Merge commit '
b81dbd6cb7522bea96d78a52f8a4c25a47b820c9'
* commit '
b81dbd6cb7522bea96d78a52f8a4c25a47b820c9':
h264_parser: Fix POC parsing for the case where MMCO_RESET is absent.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 16 Oct 2013 10:22:40 +0000 (12:22 +0200)]
Merge commit '
6b081eff4dfc3c899960f69f30cb567266b7dca3'
* commit '
6b081eff4dfc3c899960f69f30cb567266b7dca3':
fate: add vorbiscomment cover art test
Conflicts:
tests/fate/cover-art.mak
See:
1ca3902726fb8c1398ab00d146ebe3e2f31b76e6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 16 Oct 2013 10:12:13 +0000 (12:12 +0200)]
Merge commit '
68edd5be0980941924ae633d98589d56a8091bbd'
* commit '
68edd5be0980941924ae633d98589d56a8091bbd':
FATE: use proper comparison mode in the lavr tests
Merged-by: Michael Niedermayer <michaelni@gmx.at>