OSDN Git Service
Michael Niedermayer [Fri, 27 May 2016 22:40:46 +0000 (00:40 +0200)]
avformat/oggparseflac: Fix memleaks in old_flac_header()
Fixes CID1361953
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Fri, 27 May 2016 16:06:03 +0000 (18:06 +0200)]
fate: Add fate-prores-gray
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Håvard Espeland [Fri, 27 May 2016 09:06:13 +0000 (11:06 +0200)]
avcodec/proresdec2: Add support for grayscale videos
Signed-off-by: Håvard Espeland <espeland@mixedrealities.no>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Fri, 27 May 2016 11:40:34 +0000 (13:40 +0200)]
avfilter/avfiltergraph: Clear graph pointers in ff_filter_graph_remove_filter()
When a filter is no longer part of a graph, its pointers should be cleared
so no stale pointers remain.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Hendrik Leppkes [Fri, 27 May 2016 12:28:21 +0000 (14:28 +0200)]
Merge commit '
44d16df413878588659dd8901bba016b5a869fd1'
* commit '
44d16df413878588659dd8901bba016b5a869fd1':
h264_parser: eliminate H264SliceContext usage
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Gregor Riepl [Tue, 24 May 2016 13:17:22 +0000 (15:17 +0200)]
ffserver: fixed deallocation bug in build_feed_streams
Signed-off-by: Gregor Riepl <onitake@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Thu, 26 May 2016 15:09:44 +0000 (17:09 +0200)]
avformat/utils: Fix use of uninitialized variable
Fixes CID1361961
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
foo86 [Thu, 26 May 2016 11:29:35 +0000 (14:29 +0300)]
avcodec/dca: move EXSS sampling frequency arrays to dca.c
Avoids unwanted parser dependency on dcadata.
Signed-off-by: James Almer <jamrial@gmail.com>
Paul B Mahol [Sat, 21 May 2016 21:21:17 +0000 (23:21 +0200)]
avcodec/vble: add frame threading support
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Wed, 18 May 2016 18:40:08 +0000 (20:40 +0200)]
doc/developer.texi: Add a code of conduct
See: [FFmpeg-devel] [Vote] Code of Conduct
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Muhammad Faiz [Wed, 17 Feb 2016 16:20:08 +0000 (23:20 +0700)]
avfilter/src_movie: add various commands
add seek command
add get_duration command
Update to codecpar by commiter
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Matthieu Bouron [Tue, 17 May 2016 08:28:38 +0000 (10:28 +0200)]
lavc/mediacodec: add missing MediaCodec.Get{Input,Output}Buffer() checks
Matthieu Bouron [Tue, 17 May 2016 08:26:48 +0000 (10:26 +0200)]
lavc/mediacodec: factorize static fields initialization
James Almer [Wed, 25 May 2016 04:50:35 +0000 (01:50 -0300)]
avcodec/Makefile: add missing dependencies to dca parser
They are needed starting with the previous commit
Signed-off-by: James Almer <jamrial@gmail.com>
foo86 [Mon, 23 May 2016 14:58:42 +0000 (17:58 +0300)]
avcodec/dca_parser: set duration for core-less streams
Signed-off-by: James Almer <jamrial@gmail.com>
foo86 [Mon, 23 May 2016 14:58:41 +0000 (17:58 +0300)]
avcodec/dca_exss: prepare to be called from parser context
Signed-off-by: James Almer <jamrial@gmail.com>
Timo Rothenpieler [Wed, 25 May 2016 10:15:03 +0000 (12:15 +0200)]
avcodec/nvenc: Require Maxwell for lossless
Andrey Turkin [Fri, 20 May 2016 22:08:06 +0000 (01:08 +0300)]
avcodec/nvenc: CUDA frames support
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
Andrey Turkin [Fri, 20 May 2016 16:13:20 +0000 (19:13 +0300)]
avcodec/nvenc: replace custom FIFOs with AVFifos
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
Andrey Turkin [Fri, 20 May 2016 15:37:00 +0000 (18:37 +0300)]
avcodec/nvenc: combine input and output surface structures
There is no point in separate structures as they have 1:1 relationship,
they are always used together and they have same lifetime.
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
Andrey Turkin [Fri, 20 May 2016 14:49:24 +0000 (17:49 +0300)]
avcodec/nvenc: split large functions into smaller ones
Functions names and scopes are from libav. This commit basically moves
code around without changing it; it shouldn't change any functionality
except some small leak fixes on error paths.
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
Michael Niedermayer [Tue, 24 May 2016 22:59:18 +0000 (00:59 +0200)]
avformat/udp: Close the socket after destroying the thread using the socket
for send() this cannot work and even for recv() it feels very wrong and hackish
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Tue, 24 May 2016 22:06:39 +0000 (00:06 +0200)]
avformat/udp: redesign threaded udp tx code
This fixes partially completed send()
Avoids holding the mutex during send()
fixes race conditions in error handling
removes copied non thread specific blocking code
Fixes deadlocks on closure
Fixes data loss on closure
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Pavel Nikiforov [Tue, 8 Mar 2016 20:27:45 +0000 (23:27 +0300)]
avformat/udp: Add a delay between packets for streaming to clients with short buffer
This commit enables sending UDP packets in a background thread with specified delay.
When sending packets without a delay some devices with small RX buffer
( MAG200 STB, for example) will drop tail packets in bursts causing
decoding errors.
To use it specify "fifo_size" with "packet_gap" .
The output url will looks like udp://xxx:yyy?fifo_size=<output fifo
size>&packet_gap=<delay in usecs>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
dsmudhar [Sun, 22 May 2016 00:46:56 +0000 (06:16 +0530)]
libavcodec/dv_tablegen: fixed wrong printf format
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
dsmudhar [Sun, 22 May 2016 00:56:36 +0000 (06:26 +0530)]
libavfilter/vf_hwdownload: show error when ff_formats_ref fails
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Tue, 24 May 2016 17:56:55 +0000 (19:56 +0200)]
avfilter/af_hdcd: Replace complexer expression by litteral constant
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Tue, 24 May 2016 02:07:09 +0000 (04:07 +0200)]
avformat/mov: Avoid "Unintended sign extension"
Fixes CID1361957
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
ZhouXiaoyong [Tue, 17 May 2016 11:16:42 +0000 (19:16 +0800)]
avcodec/mips/idctdsp_mmi: Version 2 of the optimizations for loongson mmi
1. no longer use the register names directly and optimized code format
2. to be compatible with O32, specify type of address variable with mips_reg and handle the address variable with PTR_ operator
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
ZhouXiaoyong [Tue, 17 May 2016 11:15:46 +0000 (19:15 +0800)]
avcodec/mips/pixblockdsp_mmi: Version 2 of the optimizations for loongson mmi
1. no longer use the register names directly and optimized code format
2. to be compatible with O32, specify type of address variable with mips_reg and handle the address variable with PTR_ operator
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
ZhouXiaoyong [Tue, 17 May 2016 11:14:24 +0000 (19:14 +0800)]
avcodec/mips/blockdsp_mmi: Version 2 of the optimizations for loongson mmi
1. no longer use the register names directly and optimized code format
2. to be compatible with O32, specify type of address variable with mips_reg and handle the address variable with PTR_ operator
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
foo86 [Mon, 23 May 2016 15:41:27 +0000 (18:41 +0300)]
avcodec/dca_exss: always update downmix flags
Fixes potential parsing failure when total number of channels indicated
by EXSS asset descriptor decreases mid-stream and stale embedded downmix
flags are referenced.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Mon, 23 May 2016 19:47:02 +0000 (21:47 +0200)]
avfilter/vf_blend: fix incorrect Y variable when threading is used
Signed-off-by: Paul B Mahol <onemda@gmail.com>
dsmudhar [Sun, 22 May 2016 00:59:27 +0000 (06:29 +0530)]
libavutil/opencl: fixed uninitialized var warning
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
dsmudhar [Sun, 22 May 2016 00:45:44 +0000 (06:15 +0530)]
libavcodec/cfhd: fixed wrong printf format
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
dsmudhar [Sun, 22 May 2016 00:48:58 +0000 (06:18 +0530)]
libavfilter/af_hdcd: fixed negative signed value shift
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Petru Rares Sincraian [Sun, 22 May 2016 07:45:49 +0000 (09:45 +0200)]
fate: add aecho test
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Sun, 22 May 2016 21:32:38 +0000 (23:32 +0200)]
avcodec/truemotion2rt: also export key frame info
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Piotr Bandurski [Sun, 22 May 2016 16:02:43 +0000 (18:02 +0200)]
avcodec/iff: mention RGB8/RGBN decoder
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Sat, 21 May 2016 16:06:14 +0000 (18:06 +0200)]
avcodec/mvcdec: simplify, no need to use reget buffer
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Sun, 22 May 2016 01:22:16 +0000 (03:22 +0200)]
avformat/matroskaenc: reindent after last commit
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 22 May 2016 01:20:24 +0000 (03:20 +0200)]
avformat/matroskaenc: wrap par->format use as sample format under codec_type == AVMEDIA_TYPE_AUDI
Fixes CID1361946
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sat, 21 May 2016 23:54:50 +0000 (01:54 +0200)]
avformat/avienc: Fix memleaks on errors
Fixes CID1361951
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sat, 21 May 2016 23:50:08 +0000 (01:50 +0200)]
avformat/avienc: Rename reshuffles return variable to ensure it is not mixed up
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Sat, 21 May 2016 17:22:00 +0000 (19:22 +0200)]
avfilter/af_loudnorm: fix crash when ebur128 initialization was not successfull/complete
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sun, 15 May 2016 18:35:14 +0000 (20:35 +0200)]
avformat: add MTAF demuxer
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sun, 15 May 2016 18:45:04 +0000 (20:45 +0200)]
avcodec: add adpcm MTAF decoder
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Fri, 20 May 2016 15:55:11 +0000 (17:55 +0200)]
avfilter/avf_ahistogram: raise minimum acmax to 1
If acmax can be 0 then it could result in a division by 0
Fixes CID1351345
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Fri, 20 May 2016 18:54:10 +0000 (20:54 +0200)]
avcodec/aic: add frame threading support
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Zhou Xiaoyong [Tue, 17 May 2016 11:12:54 +0000 (19:12 +0800)]
avcodec/mips: loongson optimize h264pred with mmi v3
1. no longer use the register names directly and optimized code format
2. to be compatible with O32, specify type of address variable with mips_reg and handle the address variable with PTR_ operator
3. ff_pred16x16_plane_ functions only support N64 ABI now
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Zhou Xiaoyong [Tue, 17 May 2016 06:51:50 +0000 (14:51 +0800)]
avcodec/mips: loongson optimize hpeldsp with mmi v1
1.the codes are compatible with O32 ABI
2.use uld and mtc1 to workaround cpu 3A2000 gslwlc1 bug (gslwlc1 instruction extension bug in O32 ABI)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Zhou Xiaoyong [Tue, 17 May 2016 05:08:38 +0000 (13:08 +0800)]
avcodec/mips/mpegvideo_mmi: Version 2 of the optimizations for loongson mmi
1. no longer use the register names directly and optimized code format
2. to be compatible with O32, specify type of address variable with mips_reg and handle the address variable with PTR_ operator
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Fri, 20 May 2016 19:30:29 +0000 (21:30 +0200)]
avcodec/sgirledec: simplify, no need to use reget buffer
Signed-off-by: Paul B Mahol <onemda@gmail.com>
ZhouXiaoyong [Tue, 17 May 2016 05:02:41 +0000 (13:02 +0800)]
avcodec/mips/h264chroma_mmi: Version 2 of the optimizations for loongson mmi
1. no longer use the register names directly and optimized code format
2. to be compatible with O32, specify type of address variable with mips_reg and handle the address variable with PTR_ operator
3. use uld and mtc1 to workaround cpu 3A2000 gslwlc1 bug (gslwlc1 instruction extension bug in O32 ABI)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
foo86 [Fri, 13 May 2016 09:48:27 +0000 (12:48 +0300)]
avcodec/dca: use LUT for LBR frequency ranges
Values for unsupported frequencies > 48000 Hz are still included (parser
will make use of them).
Also convert sampling frequencies array to unsigned.
Signed-off-by: James Almer <jamrial@gmail.com>
foo86 [Fri, 13 May 2016 09:48:24 +0000 (12:48 +0300)]
avcodec/dca: simplify 'residual ok' flag tracking
Move this from separate structure field to a packet flag.
Behavior should be equivalent, except that residual flag is now properly
cleared when packet has no core frame at all.
Also print a message when forcing recovery mode due to invalid residual
to make debugging easier.
Signed-off-by: James Almer <jamrial@gmail.com>
foo86 [Fri, 13 May 2016 09:48:28 +0000 (12:48 +0300)]
avcodec/dca_parser: improve frame end search
Parse core frame size directly when searching for frame end instead of
using value extracted from previous frame.
Account for unused bits when calculating sync word distance for 14-bit
streams to avoid alias sync detection.
Parse EXSS frame size and skip over EXSS frame to avoid alias sync
detection.
Signed-off-by: James Almer <jamrial@gmail.com>
foo86 [Fri, 13 May 2016 09:48:26 +0000 (12:48 +0300)]
avcodec/dca: don't set initial sample_fmt
Valid sample_fmt will be set by dcadec_decode_frame() based on stream type.
Signed-off-by: James Almer <jamrial@gmail.com>
foo86 [Fri, 13 May 2016 09:48:32 +0000 (12:48 +0300)]
avcodec/dca: remove useless debug message
Most DTS-in-WAV streams trigger this, making debug output hard to read.
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Fri, 20 May 2016 16:00:35 +0000 (18:00 +0200)]
avutil/eval-test: Check av_expr_parse_and_eval() for failure and also check it in the fate test
Fixes CID1361940
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
foo86 [Fri, 13 May 2016 09:48:23 +0000 (12:48 +0300)]
avcodec/dca: remove Rice code length limit
Signed-off-by: James Almer <jamrial@gmail.com>
Paul B Mahol [Fri, 20 May 2016 07:50:00 +0000 (09:50 +0200)]
doc/filters: fix order of tinterlace filter drop modes
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Fri, 20 May 2016 02:18:20 +0000 (04:18 +0200)]
avcodec/utils: Move avctx->codec check before its use
Fixes CID1361954
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Thu, 19 May 2016 14:40:07 +0000 (16:40 +0200)]
avcodec/adpcm: pick correct step_index for IMA AMV
Fixes #5538
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Thu, 19 May 2016 16:49:24 +0000 (18:49 +0200)]
avcodec/options-test: Check avcodec_open2() return value
Fixes: CID1361937
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Stefano Sabatini [Thu, 7 Apr 2016 18:40:52 +0000 (20:40 +0200)]
lavf/mpegts: add ID3 entry to the REGD_types array
This allows to recognize ID3 packets from their corresponding descriptor
tag.
Stefano Sabatini [Sat, 26 Mar 2016 11:02:49 +0000 (12:02 +0100)]
lavf/mpegtsenc: set metadata stream type and write descriptor for ID3 packets
This allow to remux data packets which are then recognized as ID3 packets.
Michael Niedermayer [Thu, 19 May 2016 16:02:53 +0000 (18:02 +0200)]
avcodec/diracdec: Fix potential integer overflow
Fixes CID1361948
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Thu, 19 May 2016 10:42:41 +0000 (12:42 +0200)]
avformat/iff: parse DPAN chunk
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Wed, 18 May 2016 19:52:26 +0000 (21:52 +0200)]
avcodec/iff: add support for ANBR files
Signed-off-by: Paul B Mahol <onemda@gmail.com>
James Almer [Thu, 19 May 2016 03:02:50 +0000 (00:02 -0300)]
avformat/dtshddec: move data_start outside of DTSHDDemuxContext
It's only used in dtshd_read_header()
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Thu, 19 May 2016 01:15:41 +0000 (03:15 +0200)]
avcodec/exr: Fix potential integer overflow
Fixes CID1361949
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Wed, 18 May 2016 22:19:52 +0000 (00:19 +0200)]
avcodec/h264: Check init_get_bits8() for failure
Fixes CID1361935
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Wed, 18 May 2016 22:10:27 +0000 (00:10 +0200)]
ffmpeg_filter: Fix AVBufferSrcParameters leak
Fixed: CID1361950
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Wed, 18 May 2016 21:27:54 +0000 (23:27 +0200)]
avformat/avidec: Detect index with too short entries
Fixes Ticket5498
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Wed, 18 May 2016 21:27:20 +0000 (23:27 +0200)]
avcodec/m101: Ask for samples with too small extradata_size
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Kyle Swanson [Wed, 11 May 2016 18:30:14 +0000 (13:30 -0500)]
avfilter: add loudnorm
Signed-off-by: Kyle Swanson <k@ylo.ph>
Michael Niedermayer [Wed, 18 May 2016 15:11:20 +0000 (17:11 +0200)]
avcodec/m101: Check BPS value
Fixes null pointer dereference
Fixes Ticket5520
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Wed, 18 May 2016 10:46:43 +0000 (12:46 +0200)]
avcodec/iff: add forgotten checks for end of input buffer
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Tue, 17 May 2016 22:21:29 +0000 (00:21 +0200)]
avcodec/iff: scala anim32 & anim16 decompression
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Tue, 17 May 2016 22:53:21 +0000 (00:53 +0200)]
avformat/avio: Fix null pointer dereference in case of memleak
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Yong Lei [Tue, 17 May 2016 20:21:45 +0000 (13:21 -0700)]
avformat/avio: fix memory leak in url_find_protocol
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Chris Cunningham [Tue, 17 May 2016 18:28:32 +0000 (11:28 -0700)]
avformat/utils: Check negative bps before shifting in ff_get_pcm_codec_id()
Fixes: undefined shift.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Derek Buitenhuis [Tue, 17 May 2016 14:18:43 +0000 (15:18 +0100)]
Merge commit '
71d3305c2711d4f6ec8b92db09ff64cf4e19a58e'
* commit '
71d3305c2711d4f6ec8b92db09ff64cf4e19a58e':
h264_parse: make sure the ref count is zeroed on all failure paths
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Tue, 17 May 2016 14:16:38 +0000 (15:16 +0100)]
Merge commit '
a6e27f7add2698fdd89911632b570c3d0c3f2aaa'
* commit '
a6e27f7add2698fdd89911632b570c3d0c3f2aaa':
h264: factor out parsing the reference count into a separate file
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Tue, 17 May 2016 13:55:36 +0000 (14:55 +0100)]
Merge commit '
56b17a33f231859cbccbd741b4763617cb4ecf03'
* commit '
56b17a33f231859cbccbd741b4763617cb4ecf03':
h264: stop testing whether the reference count changes in ff_set_ref_count()
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Tue, 17 May 2016 13:38:08 +0000 (14:38 +0100)]
Merge commit '
e9f884416c76558098fc1f63825b293956e8483c'
* commit '
e9f884416c76558098fc1f63825b293956e8483c':
h264: move reading direct_spatial_mv_pred out of ff_set_ref_count()
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Hendrik Leppkes [Tue, 17 May 2016 12:21:12 +0000 (14:21 +0200)]
Merge commit '
8d0cc8ca97678f4ca87948ebabcbaab5a4f4c1f6'
* commit '
8d0cc8ca97678f4ca87948ebabcbaab5a4f4c1f6':
h264_parser: switch to h2645_parse for NAL unescaping
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Thu, 12 May 2016 10:07:40 +0000 (12:07 +0200)]
h2645_parse: support badly muxed mp4 streams
Some streams contain an additional AnnexB NAL inside the mp4/nalff NALU.
This commonly occurs in interlaced streams where both fields are packed
into the same MP4 NAL with an AnnexB startcode in between.
Port handling of this format from the previous h264 nal handling.
Fixes trac #5529
Paul B Mahol [Tue, 17 May 2016 09:01:02 +0000 (11:01 +0200)]
avcodec/iff: fix artifacts with uncompressed ham ANIMs
Signed-off-by: Paul B Mahol <onemda@gmail.com>
ZhouXiaoyong [Fri, 13 May 2016 10:03:27 +0000 (18:03 +0800)]
avcodec/mips/h264dsp_mmi: Version 2 of the optimizations for loongson mmi
1. no longer use the register names directly and optimized code format
2. to be compatible with O32, specify type of address variable with mips_reg and handle the address variable with PTR_ operator
3. optimize some unaligned loads and stores
4. use uld and mtc1 to workaround cpu 3A2000 gslwlc1 bug (gslwlc1 instruction extension bug in O32 ABI)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
James Almer [Mon, 16 May 2016 18:45:22 +0000 (15:45 -0300)]
avformat/dtshddec: implement AUPR_HDR chunk parsing
Use it to get stream duration, sample rate, channel count and initial padding
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 16 May 2016 05:13:46 +0000 (02:13 -0300)]
avformat/dtshddec: parse chunks stored after audio data
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
Paul B Mahol [Mon, 16 May 2016 20:39:03 +0000 (22:39 +0200)]
avcodec/iff: add support for ANIMs with keyframes and concatenated ANIMs
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Mon, 16 May 2016 13:37:24 +0000 (15:37 +0200)]
avcodec/iff: check if there is enough bytes left
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Mon, 16 May 2016 11:43:02 +0000 (13:43 +0200)]
avformat/utils: Do not compute the bitrate from duration == 0
Fixes division by 0 in fate-acodec-ra144
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Mon, 16 May 2016 10:49:06 +0000 (12:49 +0200)]
ffmpeg: Check that r_frame_rate is set before attempting to use it
Avoids unexpected occurance and dependency on NaN behavior and divisions by 0
Testcase: fate-lavf-fate-avi_cram
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Mon, 16 May 2016 03:10:21 +0000 (05:10 +0200)]
swresample/resample: Fix division by 0 with tap_count=1
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 15 May 2016 19:34:37 +0000 (21:34 +0200)]
swresample/rematrix: Use clipping s16 rematrixing if overflows are possible
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Sun, 15 May 2016 17:02:12 +0000 (19:02 +0200)]
avformat/adxdec: set bit_rate, fixes duration calculation
Signed-off-by: Paul B Mahol <onemda@gmail.com>