]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Wed, 16 Jul 2014 01:40:13 +0000 (03:40 +0200)]
Merge commit '
14b4e64eabc84c5a5e57c8ccc56bbeb95380823b '
* commit '
14b4e64eabc84c5a5e57c8ccc56bbeb95380823b ':
g2meet: allow size changes within original sizes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 16 Jul 2014 00:09:06 +0000 (02:09 +0200)]
Changelog: change "version <next>" to "version 2.3"
Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Tue, 15 Jul 2014 19:22:11 +0000 (15:22 -0400)]
g2meet: allow size changes within original sizes
Michael Niedermayer [Wed, 16 Jul 2014 00:06:44 +0000 (02:06 +0200)]
doc/APIchanges: update
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 15 Jul 2014 23:33:50 +0000 (01:33 +0200)]
avcodec/hevc: clear HEVClcList[i] on allocation
Fixes fate failure with --enable-memory-poisoning && make THREAD_TYPE=slice THREADS=7 fate-hevc-conformance-ENTP_C_Qualcomm_1
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Marc Jeffreys [Sat, 21 Jun 2014 04:41:45 +0000 (05:41 +0100)]
avfilter/drawtext: Add basic text shaping using libfribidi
Fixes ticket #3758
Reviewed-by: Andrey Utkin <andrey.krieger.utkin@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hanspeter Niederstrasser [Mon, 14 Jul 2014 02:49:24 +0000 (21:49 -0500)]
avdevice/avfoundation: kCVPixelFormatType_OneComponent8 only exists from 10.8 onward
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Tue, 15 Jul 2014 22:10:09 +0000 (19:10 -0300)]
diracdec: remove unused dsputil context
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 15 Jul 2014 22:06:15 +0000 (00:06 +0200)]
avformat/matroskadec: fix declaration after statement
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Vignesh Venkatasubramanian [Mon, 14 Jul 2014 16:52:23 +0000 (09:52 -0700)]
lavf: Add WebM DASH Manifest Muxer
This patch adds the ability to generate WebM DASH manifest XML using
ffmpeg. A sample command line would be as follows:
ffmpeg \
-f webm_dash_manifest -i video1.webm \
-f webm_dash_manifest -i video2.webm \
-f webm_dash_manifest -i audio1.webm \
-f webm_dash_manifest -i audio2.webm \
-map 0 -map 1 -map 2 -map 3 \
-c copy \
-f webm_dash_manifest \
-adaptation_sets “id=0,streams=0,1 id=1,streams=2,3” \
manifest.xml
It works by exporting necessary fields as metadata tags in matroskadec
and use those values to write the appropriate XML fields as per the WebM
DASH Specification [1]. Some ideas are adopted from webm-tools project
[2].
[1]
https://sites.google.com/a/webmproject.org/wiki/adaptive-streaming/webm-dash-specification
[2]
https://chromium.googlesource.com/webm/webm-tools/+/master/webm_dash_manifest/
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Vignesh Venkatasubramanian [Mon, 7 Jul 2014 19:52:37 +0000 (12:52 -0700)]
lavf/matroska: Add functions for WebM DASH Manifest
Add functions and logic to matroskadec for use by the WebM DASH Manifest
XML Muxer. The actual muxer is added in a future patch.
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stepan Bujnak [Fri, 11 Jul 2014 21:40:07 +0000 (23:40 +0200)]
Blackframe video filter now sets metadata accordingly.
the libavfilter/vf_blackframe.c filter now not only logs detected
values, but also sets frame metadata. Currently, only `pblack` value is set
but `SET_META` macro has been introduced to ease development in the future.
Signed-off-by: Stepan Bujnak <stepan.bujnak@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 15 Jul 2014 19:43:30 +0000 (21:43 +0200)]
avcodec/hevc: treat current_sps like sps_list
This simplifies the management of current_sps
Fixes Ticket3458
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 15 Jul 2014 19:43:04 +0000 (21:43 +0200)]
avcodec/hevc_ps: prevent stale pointer in malloc failure case
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Jul 2014 13:56:06 +0000 (15:56 +0200)]
avutil & avdevice: remove av_bprint_fd_contents()
MSVC does not allow passing file pointers between libs
This API can thus not work with MSVC and as it was very recently added
and its it was in no release its removial should not cause any problems
A better API will be implemented, but its not finished yet, this revert is
to avoid potentially blocking the release
Found-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Tue, 15 Jul 2014 19:26:14 +0000 (21:26 +0200)]
build: fix build with --disable-encoders
draw_edges() should probably be moved somewhere else to avoid
mpegvideo*enc* dependency to decoders.
Michael Niedermayer [Tue, 15 Jul 2014 18:18:19 +0000 (20:18 +0200)]
ffmpeg_opt: remove intra_dc_precision, its handled by AVOptions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 15 Jul 2014 17:51:02 +0000 (19:51 +0200)]
avcodec/mpegvideo_enc: make edge for interlaced mpeg2 encoding smaller
Fixes segfault
the size can probably be reduced further for the mpeg2 case
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 15 Jul 2014 17:12:55 +0000 (19:12 +0200)]
avcodec/mpegvideo_enc: check intra dc precission
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 15 Jul 2014 17:12:00 +0000 (19:12 +0200)]
avcodec/mpegvideo_enc: workaround applications specifying intra dc level based on 8 and othes based on 0bit
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 15 Jul 2014 17:04:51 +0000 (19:04 +0200)]
avcodec/options_table: add liberal limits to intra dc precission
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 15 Jul 2014 16:49:18 +0000 (18:49 +0200)]
avcodec/mpegvideo_enc: return proper error instead of failing assertion when max rate is not set
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 15 Jul 2014 13:45:06 +0000 (15:45 +0200)]
ffmpeg: Fix copying timebase to muxer context
Fixes Ticket3741
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Mon, 14 Jul 2014 23:21:15 +0000 (16:21 -0700)]
doc/utils: add missing `@c man end` title
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mickaël Raulet [Mon, 14 Jul 2014 22:20:22 +0000 (00:20 +0200)]
hevc/rext: add support for Range extension tools
SPS features/flags:
- transform_skip_rotation_enabled_flag
- transform_skip_context_enabled_flag
- implicit_rdpcm_enabled_flag
- explicit_rdpcm_enabled_flag
- intra_smoothing_disabled_flag
- persistent_rice_adaptation_enabled_flag
PPS features/flags:
- log2_max_transform_skip_block_size
- cross_component_prediction_enabled_flag
- chroma_qp_offset_list_enabled_flag
- diff_cu_chroma_qp_offset_depth
- chroma_qp_offset_list_len_minus1
- cb_qp_offset_list
- cr_qp_offset_list
- log2_sao_offset_scale_luma
- log2_sao_offset_scale_chroma
(cherry picked from commit
005294c5b939a23099871c6130c8a7cc331f73ee )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mickaël Raulet [Mon, 14 Jul 2014 22:16:53 +0000 (00:16 +0200)]
hevc/rext: basic infrastructure for supporting range extension
- support for 4:2:2 and 4:4:4 up to 12 bits
- add a new profile for range extension
(cherry picked from commit
d3c067fa65bbc871758d28aa07f54123430ca346 )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mickaël Raulet [Mon, 14 Jul 2014 19:17:33 +0000 (21:17 +0200)]
hevc: separate residu and prediction (needed for Range Extension)
(cherry picked from commit
6b3856ef57d66f2e59ee61fd2eb5f83b6d0d7d4a )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mickaël Raulet [Tue, 15 Jul 2014 08:27:14 +0000 (10:27 +0200)]
hevc: use local variable for split_cu_flag
(cherry picked from commit
ee71e9e9c12fc47856c452efb278f9f593a923ee )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mickaël Raulet [Mon, 14 Jul 2014 14:57:45 +0000 (16:57 +0200)]
hevc: move restore_tqb where it should be.
(cherry picked from commit
8fafc96a9805d11bfe32537c8f78a294a5844065 )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mickaël Raulet [Tue, 15 Jul 2014 08:23:20 +0000 (10:23 +0200)]
hevc: simplify SAO computation, delay from one row its computation
(cherry picked from commit
f2c5f647cec786df26f442a85e6d685a131a50c9 )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Mon, 14 Jul 2014 23:16:29 +0000 (16:16 -0700)]
RELEASE_NOTES: Mention Libav and add codename
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anshul Maheswhwari [Mon, 14 Jul 2014 19:12:01 +0000 (00:42 +0530)]
Adding Maintainer for dvbsubdec
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mickaël Raulet [Sun, 13 Jul 2014 08:38:13 +0000 (10:38 +0200)]
hevc/cabac: add new context for new syntax elements related to Rext(cherry picked from commit
6d71e2394f52679cfc8b86fb5880f89e6bd311d4 )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mickaël Raulet [Sun, 13 Jul 2014 08:30:13 +0000 (10:30 +0200)]
hevc: cleaning up, remove unused constants(cherry picked from commit
7eed32d076c57aa03011d65a64903e8bdb633978 )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Jul 2014 20:11:37 +0000 (22:11 +0200)]
Merge commit '
f9900822fc5f0b0c7242ca318290c090bd5d0af0 '
* commit '
f9900822fc5f0b0c7242ca318290c090bd5d0af0 ':
fate: Use the correct, local path to samples for opus reference files
Conflicts:
tests/fate/opus.mak
See:
ad7de82218e9ee2232e53ab49cda85767cf800e5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Jul 2014 19:06:58 +0000 (21:06 +0200)]
ffmpeg: Use av_stream_get_parser() to avoid ABI issues
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Jul 2014 19:03:43 +0000 (21:03 +0200)]
avformat: add av_stream_get_parser() to access avformat AVParser
The AVStream.parser field is considered private and its location cannot be
preserved while preserving also ABI compatibility to libav, as libav added fields
before it.
Some tools like ffmpeg.c access this field though
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Sat, 12 Jul 2014 18:29:17 +0000 (21:29 +0300)]
fate: Use the correct, local path to samples for opus reference files
This fixes running fate in configs where the samples are located
in a different path on the target.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Mon, 14 Jul 2014 14:51:28 +0000 (16:51 +0200)]
avformat/movenc: dont mark multichannel as mono tracks as containing the center channel
Fixes Ticket3727
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Jul 2014 14:04:43 +0000 (16:04 +0200)]
RELEASE_NOTES: fill in lib versions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Jul 2014 12:52:18 +0000 (14:52 +0200)]
avformat/wavdec: add basic sanity check for the sample count
Fixes Ticket3708
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Mon, 14 Jul 2014 02:04:57 +0000 (19:04 -0700)]
Add a release note for 2.3
Based on a patch by Clément Bœsch <u@pkh.me>.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Muhammad Faiz [Mon, 14 Jul 2014 07:13:59 +0000 (14:13 +0700)]
doc/filters: fixing typo
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Jul 2014 23:16:08 +0000 (01:16 +0200)]
avformat/asfdec: Try to improve skip case
Fixes Ticket3761
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Jul 2014 19:37:47 +0000 (21:37 +0200)]
Merge commit '
acf91215c74a91eb3b86af01dcb1d3c78d0e2310 '
* commit '
acf91215c74a91eb3b86af01dcb1d3c78d0e2310 ':
x86: dsputil: Avoid pointless CONFIG_ENCODERS indirection
Conflicts:
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputilenc_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Jul 2014 19:08:28 +0000 (21:08 +0200)]
Merge commit '
a8552ee3eb335d2fd2d6c99363367a6090298f78 '
* commit '
a8552ee3eb335d2fd2d6c99363367a6090298f78 ':
ppc: dsputil: Coalesce all init files
Conflicts:
libavcodec/ppc/dsputil_altivec.h
libavcodec/ppc/dsputil_ppc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Lukasz Marek [Sat, 12 Jul 2014 22:54:23 +0000 (00:54 +0200)]
lavf: add samba protocol via libsmbclient
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Jul 2014 17:29:23 +0000 (19:29 +0200)]
MAINTAINERS: Add ubitux for text subtitles
ubitux maintains them. It seems it was forgotten to update MAINTAINERs though
See: Re: [FFmpeg-devel] [PATCH] MAINTAINERS: add Subtitle maintainer
Message-ID: <
20140713120546 .GC26262@leki>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Star Brilliant [Wed, 9 Jul 2014 06:24:05 +0000 (14:24 +0800)]
AVFormat: LRC demuxer and muxer
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Tue, 8 Jul 2014 15:59:31 +0000 (08:59 -0700)]
x86: dsputil: Avoid pointless CONFIG_ENCODERS indirection
The remaining dsputil bits are encoding-specific anyway.
Ben Avison [Thu, 10 Jul 2014 23:14:28 +0000 (00:14 +0100)]
armv6: Accelerate ff_imdct_half for general case (mdct_bits != 6)
The previous implementation targeted DTS Coherent Acoustics, which only
requires mdct_bits == 6. This relatively small size lent itself to
unrolling the loops a small number of times, and encoding offsets
calculated at assembly time within the load/store instructions of each
iteration.
In the more general case (codecs such as AAC and AC3) much larger arrays
are used - mdct_bits == [8, 9, 11]. The old method does not scale for
these cases, so more integer registers are used with non-unrolled versions
of the loops (and with some stack spillage). The postrotation filter loop
is still unrolled by a factor of 2 to permit the double-buffering of some
VFP registers to facilitate overlap of neighbouring iterations.
I benchmarked the result by measuring the number of gperftools samples
that hit anywhere in the AAC decoder (starting from aac_decode_frame())
or specifically in ff_imdct_half_c / ff_imdct_half_vfp, for the same
example AAC stream:
Before After
Mean StdDev Mean StdDev Confidence Change
aac_decode_frame 2368.1 35.8 2117.2 35.3 100.0% +11.8%
ff_imdct_half_* 457.5 22.4 251.2 16.2 100.0% +82.1%
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sun, 13 Jul 2014 06:00:50 +0000 (03:00 -0300)]
x86/hevc_deblock: add ff_hevc_[hv]_loop_filter_luma_{8, 10}_sse2
Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Kieran Kunhya <kierank@obe.tv>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Sat, 12 Jul 2014 22:38:13 +0000 (18:38 -0400)]
h264: fix direct temporal mvs for bottom-field-first poc order.
Fixes http://forum.doom9.org/showthread.php?t=170867.
Fixes: corrupt-1677.mkv
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Tue, 8 Jul 2014 15:36:32 +0000 (08:36 -0700)]
ppc: dsputil: Coalesce all init files
Michael Niedermayer [Sun, 13 Jul 2014 03:24:50 +0000 (05:24 +0200)]
swscale/x86/rgb2rgb_template: fix 1 byte overread in yuyvtoyuv420 and uyvytoyuv420
might fix ticket 3410
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Jul 2014 01:23:54 +0000 (03:23 +0200)]
avformat/asfdec: dvrms timestamps are pts not dts
Should fix Ticket3328
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 12 Jul 2014 23:07:59 +0000 (01:07 +0200)]
avformat/utils: do not wait for packets from discarded streams for genpts
Fixes long loop
Fixes Ticket3208
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 12 Jul 2014 21:24:16 +0000 (23:24 +0200)]
configure: fix alphabetical order of previous commit
Was requested in review
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andreas Cadhalpun [Sat, 12 Jul 2014 20:11:56 +0000 (22:11 +0200)]
Add -Wformat and -Werror=format-security compiler flags
These are part of the hardening flags used by Debian.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andreas Cadhalpun [Sat, 12 Jul 2014 20:10:53 +0000 (22:10 +0200)]
fix spelling errors
Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 12 Jul 2014 19:49:15 +0000 (21:49 +0200)]
avformat/mpegts: dont clear programs during probing
Fixes Ticket 3763
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 12 Jul 2014 04:50:21 +0000 (06:50 +0200)]
avcodec/hevc: more clearing to avoid stale pointers
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 12 Jul 2014 04:36:25 +0000 (06:36 +0200)]
avcodec/hevc_ps: do not loose all reference to pointers still in use
Fixes leaving a pointer to unreferenced memory
Fixes Ticket 3115
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 12 Jul 2014 16:39:46 +0000 (18:39 +0200)]
swresample/libswresample.v: hide ff_*
Found-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Oliver Fromme [Thu, 10 Jul 2014 17:41:08 +0000 (19:41 +0200)]
doc/encoders: Document "dvdsub workaround for some players"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 11 Jul 2014 22:44:41 +0000 (00:44 +0200)]
ffplay: increase subtitle que size
Fixes part of Ticket2516 with ffplay
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sat, 12 Jul 2014 01:08:49 +0000 (22:08 -0300)]
x86/dsputilenc: remove some empty if statements
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 12 Jul 2014 03:15:31 +0000 (05:15 +0200)]
avcodec/hevc_ps: Check layer_id_included_flags count
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 12 Jul 2014 03:07:54 +0000 (05:07 +0200)]
avcodec/hevc_ps: more complete check for vps_max_dec_pic_buffering
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 12 Jul 2014 03:07:16 +0000 (05:07 +0200)]
avcodec/hevc: check slice_header_extension data length
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 12 Jul 2014 02:39:01 +0000 (04:39 +0200)]
avcodec/hevc: fix nb_sh / nb_sps check
fixes integer overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Lukasz Marek [Mon, 7 Jul 2014 15:23:40 +0000 (17:23 +0200)]
lavf/libssh: set freed pointers to NULL
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 12 Jul 2014 00:11:02 +0000 (02:11 +0200)]
ffmpeg: fix integer overflows with sub->*display_time
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 11 Jul 2014 22:40:12 +0000 (00:40 +0200)]
avcodec/pgssubdec: Fix input pts
Fixes part of Ticket2516
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 11 Jul 2014 18:35:26 +0000 (20:35 +0200)]
Merge commit '
6cc1409ba8650fb7eaedc96e970664febc02a5e9 '
* commit '
6cc1409ba8650fb7eaedc96e970664febc02a5e9 ':
examples/output: Remove unused variable
See:
9b211c43dc5f2e618f204c4a7fd184eb2ea51f02
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 11 Jul 2014 18:29:40 +0000 (20:29 +0200)]
Merge commit '
1173320249745eab01c901a39054fc0fced33c87 '
* commit '
1173320249745eab01c901a39054fc0fced33c87 ':
dsputil: Drop unused bit_depth parameter from all init functions
Conflicts:
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/ppc/dsputil_ppc.c
libavcodec/x86/dsputilenc_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Fri, 11 Jul 2014 13:49:16 +0000 (06:49 -0700)]
examples/output: Remove unused variable
doc/examples/output.c:460:9: warning: unused variable ‘i’
Diego Biurrun [Tue, 8 Jul 2014 15:31:15 +0000 (08:31 -0700)]
dsputil: Drop unused bit_depth parameter from all init functions
Paul B Mahol [Fri, 11 Jul 2014 10:38:45 +0000 (10:38 +0000)]
avformat/wavenc: use av_mallocz_array()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Fri, 11 Jul 2014 14:42:52 +0000 (16:42 +0200)]
avformat/mpegts: skip updating programs/streams when determining duration
Fixes Ticket2441
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 11 Jul 2014 13:32:27 +0000 (15:32 +0200)]
avfilter/vf_decimate: Use av_malloc_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 11 Jul 2014 13:30:41 +0000 (15:30 +0200)]
avfilter/vf_deshake: Use av_malloc_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 11 Jul 2014 13:00:49 +0000 (15:00 +0200)]
avfilter/vf_libopencv: Use av_mallocz_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 11 Jul 2014 11:07:26 +0000 (13:07 +0200)]
Merge commit '
df2aa22203afc9377832bdf800df5dbd3aa9687e '
* commit '
df2aa22203afc9377832bdf800df5dbd3aa9687e ':
mov: Clarify tkhd flag settings
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 11 Jul 2014 10:41:57 +0000 (12:41 +0200)]
Merge commit '
f90729699db9ede2bef2b28000f1795dab1b8996 '
* commit '
f90729699db9ede2bef2b28000f1795dab1b8996 ':
mov: Do not group tracks if more than one is enabled per type
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 11 Jul 2014 10:18:52 +0000 (12:18 +0200)]
Merge commit '
458e7c94830d1522997e33a0b5e87bd709e8a349 '
* commit '
458e7c94830d1522997e33a0b5e87bd709e8a349 ':
hevc: implement pic_output_flag handling
Conflicts:
libavcodec/hevc.c
libavcodec/hevc_refs.c
See:
2eddf3a6efd80aa6e9d7f42ad9a892a82c5ece70
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 11 Jul 2014 10:05:47 +0000 (12:05 +0200)]
Merge commit '
f43789b76e661acd93c21664678f140e53cfa1fa '
* commit '
f43789b76e661acd93c21664678f140e53cfa1fa ':
hevc: set the keyframe flag on output frames
See:
e2760de60514b949c0a5584d797d933f711f5b14
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 11 Jul 2014 09:54:23 +0000 (11:54 +0200)]
Merge commit '
1493b237bd3f9707319ac58d315ce45312900c10 '
* commit '
1493b237bd3f9707319ac58d315ce45312900c10 ':
hevc: Replace nal type chek with equivalent IS_IRAP macro
Conflicts:
libavcodec/hevc.c
See:
e2760de60514b949c0a5584d797d933f711f5b14
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 11 Jul 2014 09:42:05 +0000 (11:42 +0200)]
Merge commit '
17e9d52c8c93f47721ff481b8867922f4b4bd663 '
* commit '
17e9d52c8c93f47721ff481b8867922f4b4bd663 ':
hevc_ps: remove a write-only variable
Conflicts:
libavcodec/hevc_ps.c
See:
ba70563d5549fdbde4c254c9334a123c439ccc30
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Fri, 4 Jul 2014 14:53:31 +0000 (16:53 +0200)]
mov: Clarify tkhd flag settings
Luca Barbato [Fri, 4 Jul 2014 14:26:06 +0000 (16:26 +0200)]
mov: Do not group tracks if more than one is enabled per type
The specification requires at most 1 track enabled per alternate group.
Gildas Cocherel [Fri, 4 Jul 2014 15:21:56 +0000 (11:21 -0400)]
hevc: implement pic_output_flag handling
Sample-Id: OPFLAG_B_Qualcomm_1.bit, OPFLAG_C_Qualcomm_1.bit
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Mickaël Raulet [Fri, 4 Jul 2014 15:21:55 +0000 (11:21 -0400)]
hevc: set the keyframe flag on output frames
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Mickaël Raulet [Fri, 4 Jul 2014 15:21:54 +0000 (11:21 -0400)]
hevc: Replace nal type chek with equivalent IS_IRAP macro
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Anton Khirnov [Fri, 11 Jul 2014 08:38:51 +0000 (08:38 +0000)]
hevc_ps: remove a write-only variable
Michael Niedermayer [Fri, 11 Jul 2014 03:34:13 +0000 (05:34 +0200)]
avcodec/rv34: fix crash while seeking on very damaged file
Fixes null pointer dereference
Fixes Ticket2093
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 10 Jul 2014 23:04:04 +0000 (01:04 +0200)]
avformat/cdg: Do not fail if filesize cannot be determined
This fixes cdg with piped input which was broken by the previous commit
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 10 Jul 2014 22:49:52 +0000 (00:49 +0200)]
Merge commit '
44386aaad870cbd80ae0d08247ebc663476446ff '
* commit '
44386aaad870cbd80ae0d08247ebc663476446ff ':
cdg: Forward error from avio_size() in read_header() function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Nidhi Makhijani [Thu, 10 Jul 2014 08:14:51 +0000 (13:44 +0530)]
cdg: Forward error from avio_size() in read_header() function
Signed-off-by: Diego Biurrun <diego@biurrun.de>
James Almer [Tue, 8 Jul 2014 16:50:05 +0000 (13:50 -0300)]
x86/yadif-10: remove duplicate ABS macro
And use the x86util ones instead, which are optimized for mmxext/sse2.
About ~1% increase in performance on pre SSSE3 processors.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>