ffmpeg.git
6 years agoavcodec/mjpeg2jpeg_bsf: Check ff_bsf_get_packet success
Jan Sebechlebsky [Sun, 1 May 2016 23:51:25 +0000 (02:51 +0300)]
avcodec/mjpeg2jpeg_bsf: Check ff_bsf_get_packet success

This fixes ticket #5487 - mjpeg2jpeg bitstream filter causes
segmentation fault with header-less mjpeg.

Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavcodec/dca: move channel counter utility into dca.h
foo86 [Sun, 1 May 2016 15:42:14 +0000 (08:42 -0700)]
avcodec/dca: move channel counter utility into dca.h

Signed-off-by: James Almer <jamrial@gmail.com>
6 years agoavcodec/dca: move huffman data into separate object file
foo86 [Sun, 1 May 2016 15:41:43 +0000 (08:41 -0700)]
avcodec/dca: move huffman data into separate object file

Signed-off-by: James Almer <jamrial@gmail.com>
6 years agoavcodec/noise_bsf: set correct size of .priv_data_size field
Paul B Mahol [Sun, 1 May 2016 20:23:48 +0000 (22:23 +0200)]
avcodec/noise_bsf: set correct size of .priv_data_size field

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavcodec/wmalosslessdec: Fix memset sizeof
Michael Niedermayer [Sun, 1 May 2016 16:29:02 +0000 (18:29 +0200)]
avcodec/wmalosslessdec: Fix memset sizeof

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavcodec/smc: Mark pixel pointer as const
Michael Niedermayer [Sun, 1 May 2016 12:33:20 +0000 (14:33 +0200)]
avcodec/smc: Mark pixel pointer as const

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavformat/wsddec: set bit_rate, fixes duration estimation
Paul B Mahol [Sun, 1 May 2016 14:21:56 +0000 (16:21 +0200)]
avformat/wsddec: set bit_rate, fixes duration estimation

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavformat/dsfdec: set bit_rate, fixes duration estimation
Paul B Mahol [Sun, 1 May 2016 14:16:39 +0000 (16:16 +0200)]
avformat/dsfdec: set bit_rate, fixes duration estimation

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavf/mpegts: Return small probe score for very short transport streams.
Carl Eugen Hoyos [Sun, 1 May 2016 13:39:13 +0000 (15:39 +0200)]
lavf/mpegts: Return small probe score for very short transport streams.

Fixes Debian bug 823098.

6 years agolavc/fic: Do not warn about empty cursor.
Carl Eugen Hoyos [Sun, 1 May 2016 13:30:22 +0000 (15:30 +0200)]
lavc/fic: Do not warn about empty cursor.

Fixes ticket #5174.

6 years agolavc/fic: Be less verbose for invisible cursor outside of video.
Carl Eugen Hoyos [Sun, 1 May 2016 13:27:51 +0000 (15:27 +0200)]
lavc/fic: Be less verbose for invisible cursor outside of video.

6 years agolavc/srtenc: do not emit any subrip tags with text codec
Clément Bœsch [Sun, 1 May 2016 13:16:34 +0000 (15:16 +0200)]
lavc/srtenc: do not emit any subrip tags with text codec

Fixes presence of opening tags when running
  ffmpeg -i x.ass -c text x.srt

Reported-by: Jean First <jeanfirst@gmail.com>
6 years agolavc: override decode return value only in case of error
Clément Bœsch [Sun, 1 May 2016 12:53:53 +0000 (14:53 +0200)]
lavc: override decode return value only in case of error

Fixes Ticket #5350

Regression since 29412821241050c846dbceaad4b9752857659977.

6 years agoavcodec/wmalosslessdec: silence a sample request
Christophe Gisquet [Sun, 1 May 2016 09:18:09 +0000 (11:18 +0200)]
avcodec/wmalosslessdec: silence a sample request

16bits samples with CDLMS orders of 8 are currently unsupported, but have never
been encountered before.

However, 8 seems to be the most frequent, if not the only order used for 24bits.
In that case, the dsp functions are fine with handling order that are multiples
of 8, so silence the warning.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavcodec/wmalosslessdec: fix type for coeffs and lms_updates in cdlms struct
Paul B Mahol [Sun, 1 May 2016 08:46:20 +0000 (10:46 +0200)]
avcodec/wmalosslessdec: fix type for coeffs and lms_updates in cdlms struct

They should really be int16_t.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavcodec/dcaenc: move channel reordering tables to dcaenc.h
foo86 [Wed, 27 Apr 2016 17:20:20 +0000 (10:20 -0700)]
avcodec/dcaenc: move channel reordering tables to dcaenc.h

DCA core decoder no longer uses fixed tables for channel reordering.
Move them into private encoder header (and drop ff_dca_ prefix).

Signed-off-by: James Almer <jamrial@gmail.com>
6 years agoavcodec/dcaenc: reuse shared quant levels table
foo86 [Wed, 27 Apr 2016 17:19:54 +0000 (10:19 -0700)]
avcodec/dcaenc: reuse shared quant levels table

Signed-off-by: James Almer <jamrial@gmail.com>
6 years agoavformat/riff: add m704
Michael Niedermayer [Sat, 30 Apr 2016 23:26:27 +0000 (01:26 +0200)]
avformat/riff: add m704

(Ticket 2616)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavcodec/mpeg12dec: Print position in end mismatch error
Michael Niedermayer [Sat, 30 Apr 2016 23:26:03 +0000 (01:26 +0200)]
avcodec/mpeg12dec: Print position in end mismatch error

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavcodec/mpeg12dec: Do not choke on extra m704 alpha data
Michael Niedermayer [Sat, 30 Apr 2016 23:25:20 +0000 (01:25 +0200)]
avcodec/mpeg12dec: Do not choke on extra m704 alpha data

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavcodec/wmalosslessdec: fix decoding of raw pcm tiles
Paul B Mahol [Sat, 30 Apr 2016 17:48:57 +0000 (19:48 +0200)]
avcodec/wmalosslessdec: fix decoding of raw pcm tiles

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavformat/iff: fix deadlock in parsing dsd chunks
Paul B Mahol [Sat, 30 Apr 2016 16:06:53 +0000 (18:06 +0200)]
avformat/iff: fix deadlock in parsing dsd chunks

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavformat/dsfdec: check if number of channels is <= 0
Paul B Mahol [Sat, 30 Apr 2016 15:50:22 +0000 (17:50 +0200)]
avformat/dsfdec: check if number of channels is <= 0

Fixes FPE bellow.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavformat: add Wideband Single-bit Data (WSD) demuxer
Peter Ross [Fri, 29 Apr 2016 16:48:45 +0000 (18:48 +0200)]
avformat: add Wideband Single-bit Data (WSD) demuxer

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoconfigure: Add pixelutils dependency for framerate filter.
Carl Eugen Hoyos [Sat, 30 Apr 2016 11:35:24 +0000 (13:35 +0200)]
configure: Add pixelutils dependency for framerate filter.

6 years agoavcodec/utils: split side-data in new decode API too
wm4 [Thu, 28 Apr 2016 13:34:15 +0000 (15:34 +0200)]
avcodec/utils: split side-data in new decode API too

The deprecated avcodec_decode_video2() and avcodec_decode_audio4()
functions called av_packet_split_side_data() on the input packets. This
is required for packets produced by libavformat with the
AVFMT_FLAG_KEEP_SIDE_DATA flag unset (which is unfortunately the
default).

The new API didn't do this yet, although it didn't matter as no decoder
supports the new API yet. The emulation layer for the old API calls the
old API functions, which took care of the splitting. Add this code to
the new API codec entrypoints too, because we shouldn't send essentially
corrupted data to decoders.

6 years agoavformat/ffmdec: Check pix_fmt
Michael Niedermayer [Thu, 28 Apr 2016 20:50:48 +0000 (22:50 +0200)]
avformat/ffmdec: Check pix_fmt

Fixes crash
Fixes Ticket5412

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavcodec/cfhd: Don't decode coefficients if no end of header tag found. Fixes fuzzed...
Kieran Kunhya [Sun, 10 Apr 2016 15:22:15 +0000 (16:22 +0100)]
avcodec/cfhd: Don't decode coefficients if no end of header tag found. Fixes fuzzed files such as the one in in ticket #5383

6 years agoconfigure: Allow choice in choosing a symlink command
Dave Yeo [Mon, 25 Apr 2016 14:39:08 +0000 (07:39 -0700)]
configure: Allow choice in choosing a symlink command

Signed-off-by: Dave Yeo <daveryeo@telus.net>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoconfigure: Do not create/install versioned DLLs on OS/2.
Dmitriy Kuminov [Wed, 13 Apr 2016 21:45:01 +0000 (01:45 +0400)]
configure: Do not create/install versioned DLLs on OS/2.

Only one DLL for each module must be present on OS/2: SLIBNAME_WITH_MAJOR
(the same as on Windows). Creating other DLLs makes no sense as they can't
be used.

Signed-off-by: Dave Yeo <daveryeo@telus.net>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavformat/riff: support for matrox m703 mpeg-2
Александр Слободенюк [Tue, 26 Apr 2016 14:11:26 +0000 (17:11 +0300)]
avformat/riff: support for matrox m703 mpeg-2

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavutil/log: Fix occured typo
Michael Niedermayer [Wed, 27 Apr 2016 21:21:08 +0000 (23:21 +0200)]
avutil/log: Fix occured typo

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavformat/riff: assign g721 and g723 codec tags to g726 decoder
Piotr Bandurski [Wed, 27 Apr 2016 18:32:04 +0000 (20:32 +0200)]
avformat/riff: assign g721 and g723 codec tags to g726 decoder

6 years agoavcodec/nvenc: Add missing lossless presets to doc string
Timo Rothenpieler [Wed, 27 Apr 2016 20:22:29 +0000 (22:22 +0200)]
avcodec/nvenc: Add missing lossless presets to doc string

6 years agoconfigure: Don't require nonfree for nvenc
Timo Rothenpieler [Sat, 23 Apr 2016 16:55:51 +0000 (18:55 +0200)]
configure: Don't require nonfree for nvenc

As the nvEncodeApi.h header is now MIT licensed, this can be dropped.
The loaded CUDA and NVENC libraries are part of the nvidia driver, and
thus count as system libraries.

6 years agoavutil/log: added test case for av_log_format_line2
Andreas Weis [Wed, 27 Apr 2016 06:15:18 +0000 (08:15 +0200)]
avutil/log: added test case for av_log_format_line2

Signed-off-by: Andreas Weis <github@ghulbus-inc.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavutil/log: added av_log_format_line2 which returns buffer length
Andreas Weis [Wed, 27 Apr 2016 06:15:17 +0000 (08:15 +0200)]
avutil/log: added av_log_format_line2 which returns buffer length

The new function behaves the same as av_log_format_line, but also forwards
the return value from the underlying snprintf call. This will allow
callers to accurately determine the size requirements for the line buffer.

Signed-off-by: Andreas Weis <github@ghulbus-inc.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoMerge commit '549fc77273636d0d02175362af5dcd60c79f7633'
Derek Buitenhuis [Wed, 27 Apr 2016 15:52:02 +0000 (16:52 +0100)]
Merge commit '549fc77273636d0d02175362af5dcd60c79f7633'

* commit '549fc77273636d0d02175362af5dcd60c79f7633':
  svq3: move mb2br_xy to the SVQ3Context

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoMerge commit '99dde60391cade40ae026b9e385a5280be6b9882'
Derek Buitenhuis [Wed, 27 Apr 2016 15:49:10 +0000 (16:49 +0100)]
Merge commit '99dde60391cade40ae026b9e385a5280be6b9882'

* commit '99dde60391cade40ae026b9e385a5280be6b9882':
  svq3: move {ref,mv}_cache to the SVQ3Context

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoMerge commit '89a13998a1b5074411dff5a461dce3837057b0b8'
Derek Buitenhuis [Wed, 27 Apr 2016 15:48:20 +0000 (16:48 +0100)]
Merge commit '89a13998a1b5074411dff5a461dce3837057b0b8'

* commit '89a13998a1b5074411dff5a461dce3837057b0b8':
  svq3: rip out the svq3-relevant parts of pred_motion() out of h264

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoMerge commit '8eecae77ff6e2923de57dd883421d24fd53ca61f'
Derek Buitenhuis [Wed, 27 Apr 2016 15:47:52 +0000 (16:47 +0100)]
Merge commit '8eecae77ff6e2923de57dd883421d24fd53ca61f'

* commit '8eecae77ff6e2923de57dd883421d24fd53ca61f':
  svq3: move edge_emu_buffer to the SVQ3Context

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoMerge commit '527bf5f7c6890664b0f1dccd42397f4d204659fe'
Derek Buitenhuis [Wed, 27 Apr 2016 15:46:54 +0000 (16:46 +0100)]
Merge commit '527bf5f7c6890664b0f1dccd42397f4d204659fe'

* commit '527bf5f7c6890664b0f1dccd42397f4d204659fe':
  svq3: move the pred mode variables to SVQ3Context

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoMerge commit 'ecc31f6b086453ab9811dce2ae5ceb6a7c19e4ad'
Derek Buitenhuis [Wed, 27 Apr 2016 15:34:40 +0000 (16:34 +0100)]
Merge commit 'ecc31f6b086453ab9811dce2ae5ceb6a7c19e4ad'

* commit 'ecc31f6b086453ab9811dce2ae5ceb6a7c19e4ad':
  h264: move ff_h264_check_intra[4x4]_pred_mode() to h264_parse

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoMerge commit '1877712c586df2261f2806f45388c77592b89d1e'
Derek Buitenhuis [Wed, 27 Apr 2016 15:07:35 +0000 (16:07 +0100)]
Merge commit '1877712c586df2261f2806f45388c77592b89d1e'

* commit '1877712c586df2261f2806f45388c77592b89d1e':
  svq3: move mb_{x,y,xy} to SVQ3Context

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoMerge commit 'c2a4ca944d9029a3c162f8f3ddd317b83a7bd600'
Derek Buitenhuis [Wed, 27 Apr 2016 15:07:03 +0000 (16:07 +0100)]
Merge commit 'c2a4ca944d9029a3c162f8f3ddd317b83a7bd600'

* commit 'c2a4ca944d9029a3c162f8f3ddd317b83a7bd600':
  svq3: eliminate write_back_intra_pred_mode() usage

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoMerge commit 'c73fb9efb22c8d66d24de2716f7f9970f234c3c3'
Derek Buitenhuis [Wed, 27 Apr 2016 15:06:29 +0000 (16:06 +0100)]
Merge commit 'c73fb9efb22c8d66d24de2716f7f9970f234c3c3'

* commit 'c73fb9efb22c8d66d24de2716f7f9970f234c3c3':
  svq3: add all the required dsp contexts into SVQ3Context

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoMerge commit '15b0517da986b312fc2fcb364a92db328380b15b'
Derek Buitenhuis [Wed, 27 Apr 2016 14:49:40 +0000 (15:49 +0100)]
Merge commit '15b0517da986b312fc2fcb364a92db328380b15b'

* commit '15b0517da986b312fc2fcb364a92db328380b15b':
  svq3: make the dsp functions static

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoMerge commit '9b30f8dd8fa5bef5f16904cb98745b4a58f8f776'
Derek Buitenhuis [Wed, 27 Apr 2016 14:48:00 +0000 (15:48 +0100)]
Merge commit '9b30f8dd8fa5bef5f16904cb98745b4a58f8f776'

* commit '9b30f8dd8fa5bef5f16904cb98745b4a58f8f776':
  h264: remove the svq3-specific code

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoqsv: Fix wrong ticks_per_frame for H.264
Ivan Uskov [Tue, 26 Apr 2016 14:13:04 +0000 (10:13 -0400)]
qsv: Fix wrong ticks_per_frame for H.264

For H.264 stream ticks_per_frame should be 2, as per the docs.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoavcodec/alsdec: Fix bitstream reading
Umair Khan [Wed, 27 Apr 2016 03:34:18 +0000 (09:04 +0530)]
avcodec/alsdec: Fix bitstream reading

Signed-off-by: Umair Khan <omerjerk@gmail.com>
Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavcodec/shorten: make max frame size bigger if custom block size was used
Paul B Mahol [Wed, 27 Apr 2016 07:08:45 +0000 (09:08 +0200)]
avcodec/shorten: make max frame size bigger if custom block size was used

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavcodec/h264: Only recover from reference pictures
Michael Niedermayer [Tue, 26 Apr 2016 23:33:25 +0000 (01:33 +0200)]
avcodec/h264: Only recover from reference pictures

Fixes spec compliance
Fixes Ticket5346

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavcodec/svq3: fix assert type (was av_assert2 in h264 from where this was copied)
Michael Niedermayer [Tue, 26 Apr 2016 18:45:56 +0000 (20:45 +0200)]
avcodec/svq3: fix assert type (was av_assert2 in h264 from where this was copied)

Type was lost in f8d1bb2f2ce9031940019e1cda4d30bc409ee349

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavcodec/ttaenc: Reallocate packet if its too small
Michael Niedermayer [Tue, 26 Apr 2016 17:17:19 +0000 (19:17 +0200)]
avcodec/ttaenc: Reallocate packet if its too small

Fixes assertion failure
Fixes Ticket5394

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agolavc/audiotoolboxdec: move to new BSF API
Rodger Combs [Tue, 19 Apr 2016 08:50:28 +0000 (03:50 -0500)]
lavc/audiotoolboxdec: move to new BSF API

6 years agolavc/audiotoolboxdec: fix memory leak
Rodger Combs [Tue, 19 Apr 2016 08:44:17 +0000 (03:44 -0500)]
lavc/audiotoolboxdec: fix memory leak

6 years agolavf/concatdec: clear extradata when inserting h264_mp4toannexb bsf.
Nicolas George [Mon, 25 Apr 2016 11:46:10 +0000 (13:46 +0200)]
lavf/concatdec: clear extradata when inserting h264_mp4toannexb bsf.

Fix remuxing H.264-in-MP4 to Matroska, possibly others.

6 years agolavf/concatdec: remove unrelated change during codecpar merge.
Nicolas George [Sun, 24 Apr 2016 12:01:18 +0000 (14:01 +0200)]
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.

6 years agoMerge commit 'e42ca48a8bddc637a4013ab253598973f07e1a5c'
Derek Buitenhuis [Tue, 26 Apr 2016 14:11:59 +0000 (15:11 +0100)]
Merge commit 'e42ca48a8bddc637a4013ab253598973f07e1a5c'

* commit 'e42ca48a8bddc637a4013ab253598973f07e1a5c':
  svq3: rip out the mb decoding code shared with h264

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoMerge commit 'e481458bc308ee838deaeacac51929514762e7a7'
Derek Buitenhuis [Tue, 26 Apr 2016 14:04:29 +0000 (15:04 +0100)]
Merge commit 'e481458bc308ee838deaeacac51929514762e7a7'

* commit 'e481458bc308ee838deaeacac51929514762e7a7':
  h264: factor out pred weight table parsing into a separate file

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoMerge commit '90ed6c5cf7f236bc9efb47c97b40358c666d1386'
Derek Buitenhuis [Tue, 26 Apr 2016 13:09:52 +0000 (14:09 +0100)]
Merge commit '90ed6c5cf7f236bc9efb47c97b40358c666d1386'

* commit '90ed6c5cf7f236bc9efb47c97b40358c666d1386':
  h2645_parse: compute the actual data length, without trailing paddding

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoMerge commit 'b667252a41fbf5a3f6ea8c67fdbc03db3d748977'
Derek Buitenhuis [Tue, 26 Apr 2016 13:07:03 +0000 (14:07 +0100)]
Merge commit 'b667252a41fbf5a3f6ea8c67fdbc03db3d748977'

* commit 'b667252a41fbf5a3f6ea8c67fdbc03db3d748977':
  h2645_parse: add support for parsing h264

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoMerge commit '52ec149fbee57b6ca817049c9706212a0774a32c'
Derek Buitenhuis [Tue, 26 Apr 2016 13:04:03 +0000 (14:04 +0100)]
Merge commit '52ec149fbee57b6ca817049c9706212a0774a32c'

* commit '52ec149fbee57b6ca817049c9706212a0774a32c':
  h2645_parse: change the AVCodecContext* parameter to void*

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoMerge commit '8229eff4b7a98ae5d85bb75f3bb072781b4a8ebe'
Derek Buitenhuis [Tue, 26 Apr 2016 13:01:45 +0000 (14:01 +0100)]
Merge commit '8229eff4b7a98ae5d85bb75f3bb072781b4a8ebe'

* commit '8229eff4b7a98ae5d85bb75f3bb072781b4a8ebe':
  h2645_parse: add a function for uninitializing the packet

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoMerge commit 'fa936a307f5cddfc2664600157a8207ca8080af6'
Derek Buitenhuis [Tue, 26 Apr 2016 12:38:45 +0000 (13:38 +0100)]
Merge commit 'fa936a307f5cddfc2664600157a8207ca8080af6'

* commit 'fa936a307f5cddfc2664600157a8207ca8080af6':
  hevc_parse: rename into h2645_parse

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoqsvenc_hevc: Fix usage of ff_hevc_extract_rbsp
Derek Buitenhuis [Mon, 25 Apr 2016 19:03:23 +0000 (20:03 +0100)]
qsvenc_hevc: Fix usage of ff_hevc_extract_rbsp

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agolibavcodec/exr: move xsize and ysize to thread data
Martin Vignali [Sat, 23 Apr 2016 11:44:39 +0000 (13:44 +0200)]
libavcodec/exr: move xsize and ysize to thread data

Fixes slice threading.

Signed-off-by: James Almer <jamrial@gmail.com>
6 years agolavc/hevc_parse: Don't take a HEVCContext
Derek Buitenhuis [Mon, 25 Apr 2016 13:40:33 +0000 (14:40 +0100)]
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>
6 years agoavcodec/ac3dec: Reset SPX when switching from EAC3 to AC3
Michael Niedermayer [Mon, 25 Apr 2016 02:08:21 +0000 (04:08 +0200)]
avcodec/ac3dec: Reset SPX when switching from EAC3 to AC3

Fixes Ticket5319

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agopgssubdec: fix subpicture output colorspace and range
Jan Ekström [Sun, 24 Apr 2016 14:30:56 +0000 (17:30 +0300)]
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

6 years agoMerge commit 'cdb1665f70def544ddab3e3ed3763ef99c8b3873'
Derek Buitenhuis [Sun, 24 Apr 2016 11:51:34 +0000 (12:51 +0100)]
Merge commit 'cdb1665f70def544ddab3e3ed3763ef99c8b3873'

* commit 'cdb1665f70def544ddab3e3ed3763ef99c8b3873':
  aarch64: Make transpose_4x4H do a regular transpose

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoMerge commit 'edf54887e2935a30f9d9a46dd806802c3c867c0e'
Derek Buitenhuis [Sun, 24 Apr 2016 11:48:39 +0000 (12:48 +0100)]
Merge commit 'edf54887e2935a30f9d9a46dd806802c3c867c0e'

This merge is a no-op.

* commit 'edf54887e2935a30f9d9a46dd806802c3c867c0e':
  rtpdec_jpeg: fix low contrast image on low quality setting

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoMerge commit '159323897f545e7405fb9db234e0ba123e174376'
Derek Buitenhuis [Sun, 24 Apr 2016 11:36:23 +0000 (12:36 +0100)]
Merge commit '159323897f545e7405fb9db234e0ba123e174376'

* commit '159323897f545e7405fb9db234e0ba123e174376':
  intrax8: Add a local BlockDSPContext and initialize it

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoMerge commit '1eaae7abb8f208fefb4e8b9e983e61b2499206a3'
Derek Buitenhuis [Sun, 24 Apr 2016 11:34:58 +0000 (12:34 +0100)]
Merge commit '1eaae7abb8f208fefb4e8b9e983e61b2499206a3'

* commit '1eaae7abb8f208fefb4e8b9e983e61b2499206a3':
  intrax8: Reference the current AVCodecContext

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoMerge commit '8072345e9f86d88fbc4a15c17cb03f1e4701c9a5'
Derek Buitenhuis [Sun, 24 Apr 2016 11:34:16 +0000 (12:34 +0100)]
Merge commit '8072345e9f86d88fbc4a15c17cb03f1e4701c9a5'

* commit '8072345e9f86d88fbc4a15c17cb03f1e4701c9a5':
  intrax8: Keep a reference to the GetBitContext reader

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoMerge commit '65f14128c4bcf8fcd9d3ba1e20b7a22057c9cfb0'
Derek Buitenhuis [Sun, 24 Apr 2016 11:33:07 +0000 (12:33 +0100)]
Merge commit '65f14128c4bcf8fcd9d3ba1e20b7a22057c9cfb0'

* commit '65f14128c4bcf8fcd9d3ba1e20b7a22057c9cfb0':
  intrax8: Use a constant buffer instead of a ScratchpadContext

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoMerge commit 'eaeba6f241e0de0e797be10f8fda967ef8489e64'
Derek Buitenhuis [Sun, 24 Apr 2016 11:32:38 +0000 (12:32 +0100)]
Merge commit 'eaeba6f241e0de0e797be10f8fda967ef8489e64'

* commit 'eaeba6f241e0de0e797be10f8fda967ef8489e64':
  intrax8: Pass the output frame to the decoding function

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoMerge commit '577393321c389ad2973bec6168a8045c94a9e099'
Derek Buitenhuis [Sun, 24 Apr 2016 11:31:14 +0000 (12:31 +0100)]
Merge commit '577393321c389ad2973bec6168a8045c94a9e099'

* commit '577393321c389ad2973bec6168a8045c94a9e099':
  intrax8: Carry over the loopfilter value in ff_intrax8_decode_picture

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoMerge commit '68127e1bf8037a6e0acd6401cc8c5da950e3fa0a'
Derek Buitenhuis [Sun, 24 Apr 2016 11:19:53 +0000 (12:19 +0100)]
Merge commit '68127e1bf8037a6e0acd6401cc8c5da950e3fa0a'

* commit '68127e1bf8037a6e0acd6401cc8c5da950e3fa0a':
  intrax8: Keep a reference to the context idctdsp

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoMerge commit '65127450add50c3bca307edc0517d2e8382717a0'
Derek Buitenhuis [Sun, 24 Apr 2016 11:16:16 +0000 (12:16 +0100)]
Merge commit '65127450add50c3bca307edc0517d2e8382717a0'

* commit '65127450add50c3bca307edc0517d2e8382717a0':
  intrax8: Make x8_init_block_index not use mpegvideo fields

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoMerge commit '922b7e6d86e6197dfa5ebde602dd12cc66fb5f1f'
Derek Buitenhuis [Sun, 24 Apr 2016 11:08:11 +0000 (12:08 +0100)]
Merge commit '922b7e6d86e6197dfa5ebde602dd12cc66fb5f1f'

* commit '922b7e6d86e6197dfa5ebde602dd12cc66fb5f1f':
  intrax8: Use local destination buffers

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoMerge commit 'a7da517f6a5c472f46f67dd33bb6b95ccc919923'
Derek Buitenhuis [Sun, 24 Apr 2016 10:54:53 +0000 (11:54 +0100)]
Merge commit 'a7da517f6a5c472f46f67dd33bb6b95ccc919923'

* commit 'a7da517f6a5c472f46f67dd33bb6b95ccc919923':
  h264data: Move all data tables from a header to a .c file

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoMerge commit 'f4d581cda3897f66c1dda7586b93f86a591dbbef'
Derek Buitenhuis [Sun, 24 Apr 2016 10:47:15 +0000 (11:47 +0100)]
Merge commit 'f4d581cda3897f66c1dda7586b93f86a591dbbef'

* commit 'f4d581cda3897f66c1dda7586b93f86a591dbbef':
  lavc: Deduplicate zigzag_scan table

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoavfilter/vf_drawtext: Check return code of load_glyph()
Michael Niedermayer [Sun, 24 Apr 2016 10:30:20 +0000 (12:30 +0200)]
avfilter/vf_drawtext: Check return code of load_glyph()

Fixes segfault
Fixes Ticket5347

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoMerge commit '02cd8bb9cb4381c50f42a9284098cc8a33d397db'
Derek Buitenhuis [Sun, 24 Apr 2016 10:36:44 +0000 (11:36 +0100)]
Merge commit '02cd8bb9cb4381c50f42a9284098cc8a33d397db'

* commit '02cd8bb9cb4381c50f42a9284098cc8a33d397db':
  h264: Clean up #includes

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoavformat/mux: Check that deinit is set before calling it
Michael Niedermayer [Sun, 24 Apr 2016 10:07:37 +0000 (12:07 +0200)]
avformat/mux: Check that deinit is set before calling it

Fixes null pointer dereference

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavformat/mpegts: Skip over broken 0x80 headers
Michael Niedermayer [Sun, 10 Apr 2016 17:29:55 +0000 (19:29 +0200)]
avformat/mpegts: Skip over broken 0x80 headers

This fixes demuxing of 01c56b0dc1.ts

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavformat/mpegts: factor duplicate seek back code into mpegts_resync
Michael Niedermayer [Sun, 10 Apr 2016 17:23:40 +0000 (19:23 +0200)]
avformat/mpegts: factor duplicate seek back code into mpegts_resync

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavcodec/utils: Assert that the number of consumed bytes in avcodec_decode_audio4...
Michael Niedermayer [Sat, 23 Apr 2016 15:23:59 +0000 (17:23 +0200)]
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>
6 years agolavf/isom: Support Perian tag NELL for nellymoser.
Carl Eugen Hoyos [Sat, 23 Apr 2016 09:11:32 +0000 (11:11 +0200)]
lavf/isom: Support Perian tag NELL for nellymoser.

Reported by forum user turas35.

6 years agoavutil/aes: Remove duplicate include
Michael Niedermayer [Sat, 23 Apr 2016 00:04:23 +0000 (02:04 +0200)]
avutil/aes: Remove duplicate include

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavformat/tee: Handling slave failure in tee muxer
Jan Sebechlebsky [Wed, 20 Apr 2016 21:48:38 +0000 (00:48 +0300)]
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>
6 years agoavformat/tee: Fix leaks in tee muxer when open_slave fails
Jan Sebechlebsky [Wed, 20 Apr 2016 17:21:03 +0000 (20:21 +0300)]
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>
6 years agoavcodec/utils: fix minor memory leaks on avcodec_open2() failure
wm4 [Fri, 22 Apr 2016 17:29:48 +0000 (19:29 +0200)]
avcodec/utils: fix minor memory leaks on avcodec_open2() failure

6 years agoMerge commit '704a39769719d2e1ae3f13bfc562b51c9cd002d7'
Derek Buitenhuis [Fri, 22 Apr 2016 16:21:52 +0000 (17:21 +0100)]
Merge commit '704a39769719d2e1ae3f13bfc562b51c9cd002d7'

* commit '704a39769719d2e1ae3f13bfc562b51c9cd002d7':
  rtmpdh: add an stdio.h include

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoMerge commit 'e3dfef8e3c85a64dbe6388117303f5819fa3c6a2'
Derek Buitenhuis [Fri, 22 Apr 2016 16:20:43 +0000 (17:20 +0100)]
Merge commit 'e3dfef8e3c85a64dbe6388117303f5819fa3c6a2'

This commit is a no-op. Ivan Uskov is going to port it for us.

* commit 'e3dfef8e3c85a64dbe6388117303f5819fa3c6a2':
  qsvdec_h2645: switch to the new BSF API

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agodoc/APIchanges: Fix bitsream typo
Lou Logan [Fri, 22 Apr 2016 06:06:05 +0000 (22:06 -0800)]
doc/APIchanges: Fix bitsream typo

Signed-off-by: Lou Logan <lou@lrcd.com>
6 years agodoc/APIchanges: Fix bistream typo
Michael Niedermayer [Fri, 22 Apr 2016 02:30:30 +0000 (04:30 +0200)]
doc/APIchanges: Fix bistream typo

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavfilter: Add AV_OPT_FLAG_FILTERING_PARAM to where it was missing
Michael Niedermayer [Thu, 21 Apr 2016 14:49:00 +0000 (16:49 +0200)]
avfilter: Add AV_OPT_FLAG_FILTERING_PARAM to where it was missing

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavcodec: add TrueMotion 2.0 Real Time decoder
Paul B Mahol [Wed, 6 Apr 2016 09:02:39 +0000 (11:02 +0200)]
avcodec: add TrueMotion 2.0 Real Time decoder

Signed-off-by: Paul B Mahol <onemda@gmail.com>