Michael Niedermayer
005c61c6b8
avcodec/ttaenc: Reallocate packet if its too small
...
Fixes assertion failure
Fixes Ticket5394
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-26 19:45:59 +02:00
Rodger Combs
e1c20485c1
lavc/audiotoolboxdec: move to new BSF API
2016-04-26 10:35:09 -05:00
Rodger Combs
95116bf35f
lavc/audiotoolboxdec: fix memory leak
2016-04-26 10:35:09 -05:00
Nicolas George
0cb19c30c6
lavf/concatdec: clear extradata when inserting h264_mp4toannexb bsf.
...
Fix remuxing H.264-in-MP4 to Matroska, possibly others.
2016-04-26 16:58:59 +02:00
Nicolas George
b8fa374fb6
lavf/concatdec: remove unrelated change during codecpar merge.
...
Clearing the extradata is not related to the codecpar change,
and it breaks if auto_convert is disabled.
Fix trac ticket #5461 .
2016-04-26 16:58:59 +02:00
Derek Buitenhuis
f8d1bb2f2c
Merge commit ' e42ca48a8b'
...
* commit 'e42ca48a8b ':
svq3: rip out the mb decoding code shared with h264
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-26 15:11:59 +01:00
Derek Buitenhuis
ee38234c43
Merge commit ' e481458bc3'
...
* commit 'e481458bc3 ':
h264: factor out pred weight table parsing into a separate file
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-26 15:04:29 +01:00
Derek Buitenhuis
79aafd43fd
Merge commit ' 90ed6c5cf7'
...
* commit '90ed6c5cf7 ':
h2645_parse: compute the actual data length, without trailing paddding
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-26 14:27:35 +01:00
Derek Buitenhuis
438ed974b8
Merge commit ' b667252a41'
...
* commit 'b667252a41 ':
h2645_parse: add support for parsing h264
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-26 14:07:03 +01:00
Derek Buitenhuis
b5c10c4c92
Merge commit ' 52ec149fbe'
...
* commit '52ec149fbe ':
h2645_parse: change the AVCodecContext* parameter to void*
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-26 14:04:48 +01:00
Derek Buitenhuis
8e73574d4f
Merge commit ' 8229eff4b7'
...
* commit '8229eff4b7 ':
h2645_parse: add a function for uninitializing the packet
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-26 14:01:45 +01:00
Derek Buitenhuis
3c4ca4c5d7
Merge commit ' fa936a307f'
...
* commit 'fa936a307f ':
hevc_parse: rename into h2645_parse
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-26 13:56:47 +01:00
Derek Buitenhuis
492d229303
qsvenc_hevc: Fix usage of ff_hevc_extract_rbsp
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-25 20:03:23 +01:00
Martin Vignali
3ce19882c5
libavcodec/exr: move xsize and ysize to thread data
...
Fixes slice threading.
Signed-off-by: James Almer <jamrial@gmail.com>
2016-04-25 14:19:05 -03:00
Derek Buitenhuis
4791a910c0
lavc/hevc_parse: Don't take a HEVCContext
...
It's not even used anymore, and the checks are no longer
functionally important.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-25 14:40:33 +01:00
Michael Niedermayer
9ac154d1fa
avcodec/ac3dec: Reset SPX when switching from EAC3 to AC3
...
Fixes Ticket5319
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-25 04:08:21 +02:00
Jan Ekström
9779b62624
pgssubdec: fix subpicture output colorspace and range
...
Functionality used before didn't widen the values from limited to
full range. Additionally, now the decoder uses BT.709 where it
should be used according to the video resolution.
Default for not yet set colorimetry is BT.709 due to most observed
HDMV content being HD.
BT.709 coefficients were gathered from the first two parts of BT.709
to BT.2020 conversion guide in ARIB STD-B62 (Pt. 1, Chapter 6.2.2).
They were additionally confirmed by manually calculating values.
Fixes #4637
2016-04-24 23:05:04 +02:00
Derek Buitenhuis
87b8e95008
Merge commit ' cdb1665f70'
...
* commit 'cdb1665f70 ':
aarch64: Make transpose_4x4H do a regular transpose
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-24 12:51:42 +01:00
Derek Buitenhuis
4fe4c5c376
Merge commit ' edf54887e2'
...
This merge is a no-op.
* commit 'edf54887e2 ':
rtpdec_jpeg: fix low contrast image on low quality setting
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-24 12:49:00 +01:00
Derek Buitenhuis
896fce8509
Merge commit ' 159323897f'
...
* commit '159323897f ':
intrax8: Add a local BlockDSPContext and initialize it
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-24 12:36:23 +01:00
Derek Buitenhuis
52692eed61
Merge commit ' 1eaae7abb8'
...
* commit '1eaae7abb8 ':
intrax8: Reference the current AVCodecContext
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-24 12:34:58 +01:00
Derek Buitenhuis
50fa5715bc
Merge commit ' 8072345e9f'
...
* commit '8072345e9f ':
intrax8: Keep a reference to the GetBitContext reader
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-24 12:34:16 +01:00
Derek Buitenhuis
93c61c980d
Merge commit ' 65f14128c4'
...
* commit '65f14128c4 ':
intrax8: Use a constant buffer instead of a ScratchpadContext
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-24 12:33:07 +01:00
Derek Buitenhuis
36dad14693
Merge commit ' eaeba6f241'
...
* commit 'eaeba6f241 ':
intrax8: Pass the output frame to the decoding function
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-24 12:32:38 +01:00
Derek Buitenhuis
e5c655b098
Merge commit ' 577393321c'
...
* commit '577393321c ':
intrax8: Carry over the loopfilter value in ff_intrax8_decode_picture
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-24 12:31:14 +01:00
Derek Buitenhuis
83e0b1b1d7
Merge commit ' 68127e1bf8'
...
* commit '68127e1bf8 ':
intrax8: Keep a reference to the context idctdsp
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-24 12:19:53 +01:00
Derek Buitenhuis
627115b3e4
Merge commit ' 65127450ad'
...
* commit '65127450ad ':
intrax8: Make x8_init_block_index not use mpegvideo fields
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-24 12:16:16 +01:00
Derek Buitenhuis
1a9ffc59d2
Merge commit ' 922b7e6d86'
...
* commit '922b7e6d86 ':
intrax8: Use local destination buffers
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-24 12:08:11 +01:00
Derek Buitenhuis
9809371aa5
Merge commit ' a7da517f6a'
...
* commit 'a7da517f6a ':
h264data: Move all data tables from a header to a .c file
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-24 11:54:53 +01:00
Derek Buitenhuis
a5a6621616
Merge commit ' f4d581cda3'
...
* commit 'f4d581cda3 ':
lavc: Deduplicate zigzag_scan table
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-24 11:47:39 +01:00
Michael Niedermayer
2e67a99fbc
avfilter/vf_drawtext: Check return code of load_glyph()
...
Fixes segfault
Fixes Ticket5347
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-24 12:39:25 +02:00
Derek Buitenhuis
64ae08ffec
Merge commit ' 02cd8bb9cb'
...
* commit '02cd8bb9cb ':
h264: Clean up #includes
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-24 11:36:44 +01:00
Michael Niedermayer
c84ba07db4
avformat/mux: Check that deinit is set before calling it
...
Fixes null pointer dereference
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-24 12:07:37 +02:00
Michael Niedermayer
dbe1dd59e0
avformat/mpegts: Skip over broken 0x80 headers
...
This fixes demuxing of 01c56b0dc1.ts
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-24 02:51:50 +02:00
Michael Niedermayer
ea41ab0987
avformat/mpegts: factor duplicate seek back code into mpegts_resync
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-24 02:51:50 +02:00
Michael Niedermayer
38433345e5
avcodec/utils: Assert that the number of consumed bytes in avcodec_decode_audio4() is <= the input size
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-23 17:23:59 +02:00
Carl Eugen Hoyos
0499012a55
lavf/isom: Support Perian tag NELL for nellymoser.
...
Reported by forum user turas35.
2016-04-23 11:11:32 +02:00
Michael Niedermayer
a39e3e5e7b
avutil/aes: Remove duplicate include
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-23 02:05:53 +02:00
Jan Sebechlebsky
2063f3ed9c
avformat/tee: Handling slave failure in tee muxer
...
Adds per slave option 'onfail' to the tee muxer allowing an output to
fail, so other slave outputs can continue.
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
2016-04-22 20:04:27 +02:00
Jan Sebechlebsky
f9d7e9feec
avformat/tee: Fix leaks in tee muxer when open_slave fails
...
In open_slave failure can happen before bsfs array is initialized,
close_slave must check that bsfs is not NULL before accessing
tee_slave->bsfs[i] element.
Slave muxer expects write_trailer to be called if it's
write_header suceeded (so resources allocated in write_header
are freed). Therefore if failure happens after successfull
write_header call, we must ensure that write_trailer of
that particular slave is called.
Some cleanups are made by Marton Balint.
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
2016-04-22 19:49:50 +02:00
wm4
27adf9f9cd
avcodec/utils: fix minor memory leaks on avcodec_open2() failure
2016-04-22 19:29:48 +02:00
Derek Buitenhuis
53a9b164c5
Merge commit ' 704a397697'
...
* commit '704a397697 ':
rtmpdh: add an stdio.h include
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-22 17:21:52 +01:00
Derek Buitenhuis
a980cc47cd
Merge commit ' e3dfef8e3c'
...
This commit is a no-op. Ivan Uskov is going to port it for us.
* commit 'e3dfef8e3c ':
qsvdec_h2645: switch to the new BSF API
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-22 17:20:57 +01:00
Lou Logan
3eafbbe70a
doc/APIchanges: Fix bitsream typo
...
Signed-off-by: Lou Logan <lou@lrcd.com>
2016-04-21 22:06:05 -08:00
Michael Niedermayer
268b5ae10a
doc/APIchanges: Fix bistream typo
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-22 04:48:38 +02:00
Michael Niedermayer
7b7c338e9a
avfilter: Add AV_OPT_FLAG_FILTERING_PARAM to where it was missing
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-21 20:20:42 +02:00
Paul B Mahol
c85d04251d
avcodec: add TrueMotion 2.0 Real Time decoder
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2016-04-21 20:15:17 +02:00
Derek Buitenhuis
aa40df483b
Merge commit ' a638e9184d'
...
* commit 'a638e9184d ':
vf_fade: make sure the slice end is always in the frame
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-21 16:52:03 +01:00
Derek Buitenhuis
5f587b1daf
Merge commit ' 3b08d9d932'
...
* commit '3b08d9d932 ':
testprogs: K&R formatting cosmetics
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-21 16:50:06 +01:00
Derek Buitenhuis
32c044cbc6
Merge commit ' 439929859a'
...
* commit '439929859a ':
testprogs: Clean up #includes
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-21 16:04:17 +01:00