Clément Bœsch
d7a2451688
Merge commit 'b16e9b9ac9db449cae2242767dd3c3fc309357c4'
...
* commit 'b16e9b9ac9db449cae2242767dd3c3fc309357c4':
h264: move initialising the explicit pred weight table for MBAFF
Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-29 15:03:12 +02:00
Clément Bœsch
3c5a3882f9
Merge commit '77a1e2c5f8f8250dfacff24b993eb473260ed13e'
...
* commit '77a1e2c5f8f8250dfacff24b993eb473260ed13e':
h264: move direct mode inits out of h264_slice_header_parse()
Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-29 14:58:31 +02:00
Clément Bœsch
c54e2740e1
Merge commit 'd06e4d8aab9c679b6aea2591d2a9b382df9e5f74'
...
* commit 'd06e4d8aab9c679b6aea2591d2a9b382df9e5f74':
h264: start splitting decode_slice_header()
Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-29 14:55:02 +02:00
Michael Niedermayer
0c50f6905f
avcodec/h264: Remove au_pps_id
...
This should not be needed anymore and simplifies the next merge
Requested-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-06-29 14:49:15 +02:00
Michael Niedermayer
e6e8750e94
avcodec/h264: Remove current_sps_id
...
This should not be needed anymore and simplifies the next merge
Requested-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-06-29 14:49:15 +02:00
Clément Bœsch
6c841e03ce
Merge commit '2940e196c5e439d9869f8c02a49a318d0847453c'
...
* commit '2940e196c5e439d9869f8c02a49a318d0847453c':
vaapi_h265: cu_qp_delta should not be used in constant-QP mode
Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-29 12:03:47 +02:00
Clément Bœsch
4b90413cb2
Merge commit '02fa1ad9266f9b1ea11565ac2f93f45853e351e8'
...
* commit '02fa1ad9266f9b1ea11565ac2f93f45853e351e8':
vaapi_h264: Add source version identifier as unregistered SEI
Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-29 12:03:40 +02:00
Clément Bœsch
cc3de390b7
Merge commit '48e2967cd50c2e1a2a539fd697d20ead2c5c4cc8'
...
* commit '48e2967cd50c2e1a2a539fd697d20ead2c5c4cc8':
vaapi_h264: Add support for SEI messages
Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-29 12:03:28 +02:00
Clément Bœsch
19fe328f12
Merge commit '19d7667a81499d4357ec8e0851701e17c238e584'
...
* commit '19d7667a81499d4357ec8e0851701e17c238e584':
vaapi_encode: Add support for writing arbitrary additional packed headers
Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-29 12:03:20 +02:00
Clément Bœsch
3e71e34333
Merge commit '081961f819c0b16c7a860d7da7d39f1fd91bd2f0'
...
* commit '081961f819c0b16c7a860d7da7d39f1fd91bd2f0':
vaapi_h264: Add support for VUI parameters
Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-29 12:03:06 +02:00
Clément Bœsch
fc0eafb7f8
Merge commit '2e4a7bd553ec7c805b4a3b90733405a14ba69072'
...
* commit '2e4a7bd553ec7c805b4a3b90733405a14ba69072':
h264: drop unused H264Context.gb
Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-29 11:56:57 +02:00
Clément Bœsch
bef74ef367
Merge commit '4f81f8dba735c212efae077c4fec8ad4fe53b352'
...
* commit '4f81f8dba735c212efae077c4fec8ad4fe53b352':
Drop unnecessary golomb.h #includes
Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-29 11:54:54 +02:00
Clément Bœsch
4b9574b275
Merge commit '197ae68e78784524a7ccf97a3c301092715305d3'
...
* commit '197ae68e78784524a7ccf97a3c301092715305d3':
Drop unnecessary unary.h #includes
Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-29 11:52:34 +02:00
Clément Bœsch
bf7d016219
Merge commit '6ac52f05a6fcadb84972c9557b28c67a416f866b'
...
* commit '6ac52f05a6fcadb84972c9557b28c67a416f866b':
dvbsub_parser: Add missing mem.h #include
Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-29 11:52:03 +02:00
Clément Bœsch
daedfa7254
Merge commit '81f769fa129edc51c28285649c2df6da717e718f'
...
* commit '81f769fa129edc51c28285649c2df6da717e718f':
gsm: Move requant_tab table to the gsm tables file
Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-29 11:48:53 +02:00
Clément Bœsch
0501305e38
Merge commit '42dc214323637464759354912e18b2bee1884dd1'
...
* commit '42dc214323637464759354912e18b2bee1884dd1':
mpc: Drop unused GetBitContext context member
Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-29 11:46:36 +02:00
Clément Bœsch
c7253353f8
Merge commit '85b8403c6fd11e1c570caa970c7f435ac5f9583e'
...
* commit '85b8403c6fd11e1c570caa970c7f435ac5f9583e':
svq1enc: Drop unused GetBitContext context member
Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-29 11:45:37 +02:00
Clément Bœsch
f8beca6f10
Merge commit '6d8fd614ff957af242efcd8a6a0619874382f3a4'
...
* commit '6d8fd614ff957af242efcd8a6a0619874382f3a4':
vorbis: Kill some pointless debug code
Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-29 11:43:57 +02:00
Clément Bœsch
9afa64dfdf
Merge commit '59c6509d9f0236acbc317198eab76dab8320bced'
...
* commit '59c6509d9f0236acbc317198eab76dab8320bced':
mss2: Drop a silly assert
Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-29 11:42:42 +02:00
Clément Bœsch
f755aa5ebd
lavc: move 2 more BITSTREAM_READER_LE definitions
...
This was mentioned to be in ae753dbd0de448b51f0e0b980c26b94747ec44f5 but
actually wasn't.
2016-06-29 11:41:12 +02:00
Clément Bœsch
ae753dbd0d
Merge commit 'b668662939de3a02454cfc9ba3e6d10b87527a40'
...
* commit 'b668662939de3a02454cfc9ba3e6d10b87527a40':
get_bits: Move BITSTREAM_READER_LE definition before all relevant #includes
The merge commit also includes changes for libavcodec/interplayacm.c and
libavcodec/truemotion2rt.c
Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-29 11:35:10 +02:00
Clément Bœsch
543142990b
Merge commit '09c4e5c5988c0037d108c5fc2a137d9ad488f7f4'
...
* commit '09c4e5c5988c0037d108c5fc2a137d9ad488f7f4':
indeo2: Drop disabled big-endian ir2_codes table
Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-29 11:20:20 +02:00
Clément Bœsch
9b35242370
Merge commit 'b7f98659f21dce438c33b512e25fd64b8d07c347'
...
* commit 'b7f98659f21dce438c33b512e25fd64b8d07c347':
Remove unnecessary get_bits.h #includes
Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-29 11:16:01 +02:00
Matthieu Bouron
db0af7250a
lavc/mediacodecdec_h264: add missing NAL headers to SPS/PPS buffers
...
Fixes a regression introduced by 0cd5e281df3f69c1ed8f2a72a5bcbf9691e1b5d5.
2016-06-29 10:46:29 +02:00
Michael Niedermayer
6cc4c42226
avcodec/ccaption_dec: Fix mixed declaration and statement.
...
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-06-28 02:33:03 +02:00
Aman Gupta
4448f16ef5
avcodec/ccaption_dec: implement tab offset commands
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-06-28 01:52:31 +02:00
Clément Bœsch
c5566f0a94
lavc/pnm_parser: disable parsing for text based PNMs
...
P1, P2, and P3 are respectively the text versions of PBM, PGM and PPM
files.
We can not obtain the buffer size using av_imgage_get_buffer_size() as
every pixel in the picture will occupy a random size between 16 and 32
bits ("4 " and "231 " are such example).
Ideally, we could look for the next header (or EOF) in the bytestream,
but this commit is meant to fix a decoding regression introduced by
48ac4532d437790e56b8ed5d0d467dc88685f035.
Fix Ticket #5670
2016-06-27 18:04:50 +02:00
Matthieu Bouron
0acc170aad
Merge commit '535a742c2695a9e0c586b50d7fa76e318232ff24'
...
* commit '535a742c2695a9e0c586b50d7fa76e318232ff24':
build: Change structure of the linker version script templates
Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
2016-06-27 17:56:47 +02:00
Matthieu Bouron
9eb3da2f99
asm: FF_-prefix internal macros used in inline assembly
...
See merge commit '39d6d3618d48625decaff7d9bdbb45b44ef2a805'.
2016-06-27 17:21:18 +02:00
Michael Niedermayer
e9394ca63d
avcodec/libopenjpegenc: Set numresolutions by default to a value that is not too large
...
Fixes issues with libopenjpeg 2.1
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-06-26 18:08:04 +02:00
Hendrik Leppkes
c142dc203e
Merge commit 'dc40a70c5755bccfb1a1349639943e1f408bea50'
...
* commit 'dc40a70c5755bccfb1a1349639943e1f408bea50':
Drop unnecessary libavutil/x86/asm.h #includes
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-06-26 15:53:00 +02:00
Hendrik Leppkes
f2a3798ea4
Merge commit 'a86aa16088ad7f22a8918d71adb8c040d6033d84'
...
* commit 'a86aa16088ad7f22a8918d71adb8c040d6033d84':
vaapi_h264: Add trivial support for low-power encoding
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-06-26 15:44:43 +02:00
Hendrik Leppkes
d3327b7eda
Merge commit 'b51c7c6b8a5b35cfd06cb9655f9ec4c9f0ddd81b'
...
* commit 'b51c7c6b8a5b35cfd06cb9655f9ec4c9f0ddd81b':
vaapi_h264: Fix frame_num after non-reference frames
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-06-26 15:44:35 +02:00
Hendrik Leppkes
18b1b8be6a
Merge commit '2bfa067d0b636e7b2004fb0ad5a53d0d48c6de32'
...
* commit '2bfa067d0b636e7b2004fb0ad5a53d0d48c6de32':
vaapi_encode: Check config attributes before creating config
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-06-26 15:44:25 +02:00
Hendrik Leppkes
2c1d0f871f
Merge commit '24b5cff01bbac4e08acfd6d19c499e880988f520'
...
* commit '24b5cff01bbac4e08acfd6d19c499e880988f520':
lavc: handle hw_frames_ctx where necessary
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-06-26 15:20:43 +02:00
Hendrik Leppkes
b20fe650ef
Merge commit '4024b566d664a4b161d677554be52f32e7ad4236'
...
* commit '4024b566d664a4b161d677554be52f32e7ad4236':
golomb: Give svq3_get_se_golomb()/svq3_get_ue_golomb() better names
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-06-26 15:12:48 +02:00
Hendrik Leppkes
b95534bb67
Merge commit 'e47b8bbf0b54599d44b9330eb4d68cdde4f6d298'
...
* commit 'e47b8bbf0b54599d44b9330eb4d68cdde4f6d298':
avcodec: Bump micro version after changing public JPEG 2000 defines
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-06-26 14:49:10 +02:00
Hendrik Leppkes
46ff31d39c
Merge commit 'ad61da054bd8c74a5d5b38d80846228fc6147108'
...
* commit 'ad61da054bd8c74a5d5b38d80846228fc6147108':
jpeg2000: Fix profile define values
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-06-26 14:41:05 +02:00
Hendrik Leppkes
f9a186c59b
Merge commit '2ef6dab0a79a9852a92ed80b07f9e32a37530d9e'
...
* commit '2ef6dab0a79a9852a92ed80b07f9e32a37530d9e':
lavc: document that avcodec_close() should not be used
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-06-26 14:35:10 +02:00
Hendrik Leppkes
69c38d64d7
Merge commit '04fc8e24a091ed1d77d7a3c0cbcfe60baec19a9f'
...
* commit '04fc8e24a091ed1d77d7a3c0cbcfe60baec19a9f':
lavc: deprecate avcodec_get_context_defaults3()
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-06-26 14:34:53 +02:00
Hendrik Leppkes
6988cf2969
Merge commit '5f30ac27795f9f98043e8582ccaad8813104adc4'
...
* commit '5f30ac27795f9f98043e8582ccaad8813104adc4':
lavc: deprecate avcodec_copy_context()
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-06-26 14:34:02 +02:00
Hendrik Leppkes
314e608631
Merge commit '74b1bf632f125a795e66e5fd0a060b9c7c55b7a3'
...
* commit '74b1bf632f125a795e66e5fd0a060b9c7c55b7a3':
mp3: Make the extrasize explicit
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-06-26 14:31:53 +02:00
Hendrik Leppkes
e2836397f1
Merge commit '52567e8198669a1e7493c75771613f87a90466c3'
...
* commit '52567e8198669a1e7493c75771613f87a90466c3':
get_bits: Drop some TRACE-level debug code
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-06-26 14:19:48 +02:00
Paul B Mahol
8fb92ea7e2
avcodec: add YUY2 Lossless Codec decoder
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2016-06-26 10:18:10 +02:00
Michael Niedermayer
9981b70da5
avcodec/h264_sei: Do not skip subsequent SEIs on errors potentially caused by missing parameter sets.
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-06-26 00:44:47 +02:00
Timo Rothenpieler
888a5c7947
avcodec/nvenc: Bring encoder names in line with other encoders
2016-06-25 23:05:17 +02:00
Martin Storsjö
a590d344e3
omx: Don't return > 0 from omx_encode_frame
...
The encode function is supposed to just return 0 on success.
This stems from a mixup with the return value of decode functions.
Reviewed-by: Jan Gerber <j@v2v.cc>
Signed-off-by: Martin Storsjö <martin@martin.st>
2016-06-25 21:39:17 +02:00
Aman Gupta
ee2a8f142b
avcodec/omx: fix deprecation warning for ff_alloc_packet
...
Tested-by: Jan Gerber <j@v2v.cc>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-06-25 18:48:59 +02:00
Martin Vignali
d96b8144c0
avcodec/exr: add missed hunks from previous exr commit
2016-06-25 18:28:06 +02:00
Martin Vignali
1e38791b7f
avcodec/exr: fix reading float channel when there is half and float channels in a file
2016-06-25 18:10:10 +02:00