ffmpeg.git
4 years agoMerge commit '5a0e953c2465be9d449d5f523c3d3e2b886910b2'
Michael Niedermayer [Fri, 13 Mar 2015 21:48:54 +0000 (22:48 +0100)]
Merge commit '5a0e953c2465be9d449d5f523c3d3e2b886910b2'

* commit '5a0e953c2465be9d449d5f523c3d3e2b886910b2':
  mjpeg: Mark decoder family as thread safe

Conflicts:
libavcodec/mjpegbdec.c
libavcodec/mjpegdec.c
libavcodec/mxpegdec.c
libavcodec/sp5xdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '117b432748ca87de4cd0f09d9b1495545e264733'
Michael Niedermayer [Fri, 13 Mar 2015 21:20:17 +0000 (22:20 +0100)]
Merge commit '117b432748ca87de4cd0f09d9b1495545e264733'

* commit '117b432748ca87de4cd0f09d9b1495545e264733':
  lavc: Introduce AVCodec internal capabilities

Conflicts:
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '9993a067f6c8c7e7838052ac3146aa6b80dd7e81'
Michael Niedermayer [Fri, 13 Mar 2015 21:02:19 +0000 (22:02 +0100)]
Merge commit '9993a067f6c8c7e7838052ac3146aa6b80dd7e81'

* commit '9993a067f6c8c7e7838052ac3146aa6b80dd7e81':
  lavc: Improve thread locking error message

Conflicts:
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agomjpeg: Mark decoder family as thread safe
Vittorio Giovara [Wed, 11 Mar 2015 20:43:59 +0000 (20:43 +0000)]
mjpeg: Mark decoder family as thread safe

No global variables are used and the VLC tables are allocated without
static elements. This will allow using a JPEG decoding context within
other decoders.

4 years agolavc: Introduce AVCodec internal capabilities
Vittorio Giovara [Wed, 11 Mar 2015 20:43:58 +0000 (20:43 +0000)]
lavc: Introduce AVCodec internal capabilities

This field is designed for marking codec properties useful to lavc internals.
Two internal capabilities are added:
 - FF_CODEC_CAP_INIT_THREADSAFE: codec can be opened without locks;
 - FF_CODEC_CAP_INIT_CLEANUP: codec frees memory if initialization fails.

4 years agolavc: Improve thread locking error message
Vittorio Giovara [Wed, 11 Mar 2015 20:43:57 +0000 (20:43 +0000)]
lavc: Improve thread locking error message

4 years agoavformat/http: support auto reconnect
Zhang Rui [Thu, 12 Mar 2015 03:39:55 +0000 (11:39 +0800)]
avformat/http: support auto reconnect

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/flvdec: add support for OnCaption
Michael Niedermayer [Fri, 13 Mar 2015 15:25:27 +0000 (16:25 +0100)]
avformat/flvdec: add support for OnCaption

4 years agoavformat/flvdec: re enable flv_data_packet()
Michael Niedermayer [Tue, 20 Jan 2015 22:56:17 +0000 (23:56 +0100)]
avformat/flvdec: re enable flv_data_packet()

Found-by: kurosu
Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/flvdec: Change subtitle stream type to subtitle type
Michael Niedermayer [Fri, 13 Mar 2015 15:00:53 +0000 (16:00 +0100)]
avformat/flvdec: Change subtitle stream type to subtitle type

Previous-version-reviewed-by: Andreas Cadhalpun
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/svq1dec: Fix undefined shifts
Michael Niedermayer [Fri, 13 Mar 2015 03:46:44 +0000 (04:46 +0100)]
avcodec/svq1dec: Fix undefined shifts

Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavc: Print number of reference frames if debug level >= verbose.
Carl Eugen Hoyos [Fri, 13 Mar 2015 07:52:36 +0000 (08:52 +0100)]
lavc: Print number of reference frames if debug level >= verbose.

4 years agolavf: Do not list mov-only codecs in riff.c.
Carl Eugen Hoyos [Fri, 13 Mar 2015 07:49:03 +0000 (08:49 +0100)]
lavf: Do not list mov-only codecs in riff.c.

Instead check for all mov code-points when demuxing avi
and print a warning if a video codec is found like this.
Fixes a regression similar to the one described in ticket #4307.

4 years agodoc: Fix alphabetic ordering for decklink input device.
Carl Eugen Hoyos [Fri, 13 Mar 2015 00:57:42 +0000 (01:57 +0100)]
doc: Fix alphabetic ordering for decklink input device.

4 years agox86: xvid_idct: port SSE2 iDCT to yasm
Christophe Gisquet [Tue, 10 Mar 2015 23:11:51 +0000 (23:11 +0000)]
x86: xvid_idct: port SSE2 iDCT to yasm

The main difference consists in renaming properly labels, and
letting yasm select the gprs for skipping 1D transforms.

Previous-version-reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '913aa9a4874418724183a3ec862cdc63b829367d'
Michael Niedermayer [Thu, 12 Mar 2015 23:02:18 +0000 (00:02 +0100)]
Merge commit '913aa9a4874418724183a3ec862cdc63b829367d'

* commit '913aa9a4874418724183a3ec862cdc63b829367d':
  libx264: Return more meaningful error codes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '6bdae41d3ef74a0865e8f87896e649f93b2f39bd'
Michael Niedermayer [Thu, 12 Mar 2015 22:50:41 +0000 (23:50 +0100)]
Merge commit '6bdae41d3ef74a0865e8f87896e649f93b2f39bd'

* commit '6bdae41d3ef74a0865e8f87896e649f93b2f39bd':
  matroskadec: Check memory allocations

Conflicts:
libavformat/matroskadec.c

See: 3e2a5b33f0355eeb80b6b2805be7f1b4fa1d1a46
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'c3bd1d60af97e8d2568dac9fcce7bdabb4ff93c8'
Michael Niedermayer [Thu, 12 Mar 2015 21:39:27 +0000 (22:39 +0100)]
Merge commit 'c3bd1d60af97e8d2568dac9fcce7bdabb4ff93c8'

* commit 'c3bd1d60af97e8d2568dac9fcce7bdabb4ff93c8':
  formats: Check memory allocations

Conflicts:
libavfilter/formats.c

See: 527ca3985c736ffe077a82fdf3616f0fd571b923
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '5a2645cafeca1c2207ac55cc831c3349572a82ed'
Michael Niedermayer [Thu, 12 Mar 2015 20:58:38 +0000 (21:58 +0100)]
Merge commit '5a2645cafeca1c2207ac55cc831c3349572a82ed'

* commit '5a2645cafeca1c2207ac55cc831c3349572a82ed':
  nutdec: Prevent leaks on memory error

Conflicts:
libavformat/nutdec.c

See: 269845db86d994c7d43c3ad6eabd4fde5bb391ea
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'edca1dd552efa1ebef016ca9eff4ce6757605819'
Michael Niedermayer [Thu, 12 Mar 2015 20:50:36 +0000 (21:50 +0100)]
Merge commit 'edca1dd552efa1ebef016ca9eff4ce6757605819'

* commit 'edca1dd552efa1ebef016ca9eff4ce6757605819':
  xcbgrab: Check av_strdup() allocation

Conflicts:
libavdevice/xcbgrab.c

See: db442c873631065e8719df6da91c016d25501084
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '17c45d4d056d0e10ecb88b424ec9e68be398da5e'
Michael Niedermayer [Thu, 12 Mar 2015 20:38:47 +0000 (21:38 +0100)]
Merge commit '17c45d4d056d0e10ecb88b424ec9e68be398da5e'

* commit '17c45d4d056d0e10ecb88b424ec9e68be398da5e':
  libtheora: Check frame allocation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'a72d93daa09ffbad2771f1450820941055eaf210'
Michael Niedermayer [Thu, 12 Mar 2015 20:30:37 +0000 (21:30 +0100)]
Merge commit 'a72d93daa09ffbad2771f1450820941055eaf210'

* commit 'a72d93daa09ffbad2771f1450820941055eaf210':
  mpegvideo_enc: Check AVCodecContext allocation

Conflicts:
libavcodec/mpegvideo_enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '78c892284150e12f6b08b287bdf7e62307c6985f'
Michael Niedermayer [Thu, 12 Mar 2015 20:20:20 +0000 (21:20 +0100)]
Merge commit '78c892284150e12f6b08b287bdf7e62307c6985f'

* commit '78c892284150e12f6b08b287bdf7e62307c6985f':
  dca: Document the permuted order in the lfe_fir_64 and lfe_fir_128 tables

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agohevcdsp: fix compilation for arm and aarch64
James Almer [Thu, 12 Mar 2015 18:35:05 +0000 (15:35 -0300)]
hevcdsp: fix compilation for arm and aarch64

Also add av_cold to ff_hevcdsp_init_arm.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibx264: Return more meaningful error codes
Himangi Saraogi [Thu, 12 Mar 2015 16:20:13 +0000 (21:50 +0530)]
libx264: Return more meaningful error codes

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agomatroskadec: Check memory allocations
Vittorio Giovara [Thu, 12 Mar 2015 13:04:09 +0000 (13:04 +0000)]
matroskadec: Check memory allocations

CC: libav-stable@libav.org
4 years agoformats: Check memory allocations
Vittorio Giovara [Thu, 12 Mar 2015 15:34:32 +0000 (15:34 +0000)]
formats: Check memory allocations

4 years agomips/asmdefs: use _ABI64 as defined by gcc
James Cowgill [Wed, 11 Mar 2015 14:59:28 +0000 (14:59 +0000)]
mips/asmdefs: use _ABI64 as defined by gcc

Unfortunately android < api 21 (lollipop) doesn't have the sgidefs.h header,
the easiest way around this is to just use the preprocessor definitions from
gcc / clang.

Signed-off-by: James Cowgill <james410@cowgill.org.uk>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agonutdec: Prevent leaks on memory error
Vittorio Giovara [Wed, 11 Mar 2015 19:24:59 +0000 (19:24 +0000)]
nutdec: Prevent leaks on memory error

Bug-Id: CID 205122 / CID 205123

4 years agoxcbgrab: Check av_strdup() allocation
Vittorio Giovara [Wed, 11 Mar 2015 19:25:01 +0000 (19:25 +0000)]
xcbgrab: Check av_strdup() allocation

Bug-Id: CID 1274038

4 years agolibtheora: Check frame allocation
Vittorio Giovara [Thu, 12 Mar 2015 12:34:52 +0000 (12:34 +0000)]
libtheora: Check frame allocation

4 years agompegvideo_enc: Check AVCodecContext allocation
Vittorio Giovara [Wed, 11 Mar 2015 19:46:29 +0000 (19:46 +0000)]
mpegvideo_enc: Check AVCodecContext allocation

4 years agoavcodec/vp9: Fix undefined shifts in decode_frame_header()
Michael Niedermayer [Thu, 12 Mar 2015 01:01:33 +0000 (02:01 +0100)]
avcodec/vp9: Fix undefined shifts in decode_frame_header()

Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/h264_mb: Fix undefined shifts
Michael Niedermayer [Thu, 12 Mar 2015 00:49:48 +0000 (01:49 +0100)]
avcodec/h264_mb: Fix undefined shifts

Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agohevc: delay ff_thread_finish_setup for hwaccel
Rainer Hochecker [Thu, 12 Mar 2015 13:08:25 +0000 (14:08 +0100)]
hevc: delay ff_thread_finish_setup for hwaccel

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodca: Document the permuted order in the lfe_fir_64 and lfe_fir_128 tables
Niels Möller [Thu, 12 Mar 2015 12:26:40 +0000 (13:26 +0100)]
dca: Document the permuted order in the lfe_fir_64 and lfe_fir_128 tables

4 years agoMerge commit 'b97f427fb56bdbf7de8e2d4b72d01114aa6eceda'
Michael Niedermayer [Thu, 12 Mar 2015 11:37:13 +0000 (12:37 +0100)]
Merge commit 'b97f427fb56bdbf7de8e2d4b72d01114aa6eceda'

* commit 'b97f427fb56bdbf7de8e2d4b72d01114aa6eceda':
  lavf: Explicitly convert types at function pointer assignment

Conflicts:
libavformat/avio.c
libavformat/aviobuf.c
libavformat/swfenc.c

See: a76a2ffe9d7773d59bb1bc228a6660e23672c490 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '9c8074050745184a61059ad56045ad711299e33d'
Michael Niedermayer [Thu, 12 Mar 2015 11:25:29 +0000 (12:25 +0100)]
Merge commit '9c8074050745184a61059ad56045ad711299e33d'

* commit '9c8074050745184a61059ad56045ad711299e33d':
  configure: Mark qsv subsystem as not selectable on the command line

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/colormatrix:add slice threading
Yayoi [Tue, 10 Mar 2015 05:01:47 +0000 (22:01 -0700)]
avfilter/colormatrix:add slice threading

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/buffer: Avoid moving the AVBufferRef to a new place in memory in av_buffer_mak...
Michael Niedermayer [Wed, 14 Jan 2015 23:42:55 +0000 (00:42 +0100)]
avutil/buffer: Avoid moving the AVBufferRef to a new place in memory in av_buffer_make_writable()

This allows making a AVBufferRef writable without the need to
update all pointers to it

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/buffer: Avoid moving the AVBufferRef to a new place in memory in av_buffer_rea...
Michael Niedermayer [Wed, 14 Jan 2015 23:42:55 +0000 (00:42 +0100)]
avutil/buffer: Avoid moving the AVBufferRef to a new place in memory in av_buffer_realloc()

This allows reallocating AVBufferRefs without the need to update
all pointers to it

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '67142a8c721c7916c9ad2eb439c14d567aeb88c1'
Michael Niedermayer [Wed, 11 Mar 2015 23:31:20 +0000 (00:31 +0100)]
Merge commit '67142a8c721c7916c9ad2eb439c14d567aeb88c1'

* commit '67142a8c721c7916c9ad2eb439c14d567aeb88c1':
  roqvideoenc: set enc->avctx in roq_encode_init

See: cf82c426fadf90105e1fb9d5ecd267cc3aa2b288
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '72211a2af0470799c9611b9c1c7039ab14a34a0a'
Michael Niedermayer [Wed, 11 Mar 2015 23:23:28 +0000 (00:23 +0100)]
Merge commit '72211a2af0470799c9611b9c1c7039ab14a34a0a'

* commit '72211a2af0470799c9611b9c1c7039ab14a34a0a':
  asfenc: fix leaking asf->index_ptr on error

See: 2c8cff2be4a044c66e4904efa156dafd0d332d25
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '212556cd2144659dc6b9d121ddb38cd272bd10ae'
Michael Niedermayer [Wed, 11 Mar 2015 23:14:43 +0000 (00:14 +0100)]
Merge commit '212556cd2144659dc6b9d121ddb38cd272bd10ae'

* commit '212556cd2144659dc6b9d121ddb38cd272bd10ae':
  qsv: Improve the log message of when initializing MFX_IMPL_HARDWARE{2, 3, 4}

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavf: Explicitly convert types at function pointer assignment
Diego Biurrun [Tue, 10 Feb 2015 15:02:30 +0000 (16:02 +0100)]
lavf: Explicitly convert types at function pointer assignment

This fixes a number of "assignment from incompatible pointer type" warnings.

4 years agoconfigure: Mark qsv subsystem as not selectable on the command line
Diego Biurrun [Wed, 11 Mar 2015 09:39:26 +0000 (10:39 +0100)]
configure: Mark qsv subsystem as not selectable on the command line

4 years agoMerge commit '7a76c6c4df31d1ff65464ccf3171acd57ef004eb'
Michael Niedermayer [Wed, 11 Mar 2015 19:38:08 +0000 (20:38 +0100)]
Merge commit '7a76c6c4df31d1ff65464ccf3171acd57ef004eb'

* commit '7a76c6c4df31d1ff65464ccf3171acd57ef004eb':
  configure: Enable colored output for gcc 4.9+

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'bacc92b59bfa5d6a1f631e63e46fc1d2fb934e51'
Michael Niedermayer [Wed, 11 Mar 2015 19:28:36 +0000 (20:28 +0100)]
Merge commit 'bacc92b59bfa5d6a1f631e63e46fc1d2fb934e51'

* commit 'bacc92b59bfa5d6a1f631e63e46fc1d2fb934e51':
  rtpdec_vp9: Drop extra sanity check for size of input packet

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoroqvideoenc: set enc->avctx in roq_encode_init
Andreas Cadhalpun [Mon, 9 Mar 2015 18:24:09 +0000 (19:24 +0100)]
roqvideoenc: set enc->avctx in roq_encode_init

So far it is only set in roq_encode_frame, but it is used in
roq_encode_end to free the coded_frame. This currently segfaults if
roq_encode_frame is not called between roq_encode_init and
roq_encode_end.

CC:libav-stable@libav.org
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agoasfenc: fix leaking asf->index_ptr on error
Andreas Cadhalpun [Mon, 9 Mar 2015 18:31:39 +0000 (19:31 +0100)]
asfenc: fix leaking asf->index_ptr on error

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agoMerge commit 'fe99c52fa99e44961a09cd1324aefd492b797fc8'
Michael Niedermayer [Wed, 11 Mar 2015 19:17:40 +0000 (20:17 +0100)]
Merge commit 'fe99c52fa99e44961a09cd1324aefd492b797fc8'

* commit 'fe99c52fa99e44961a09cd1324aefd492b797fc8':
  mp3: Properly use AVCodecContext API

Conflicts:
libavformat/mp3dec.c

See: 6ad42b3e15478284321dd285acaf189a16590854
See: b851bc20c6931c084710e69f7eec30d8c1bdb68e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '9272c965d9559a90ee64d46aebd99c117e07f7a3'
Michael Niedermayer [Wed, 11 Mar 2015 19:09:18 +0000 (20:09 +0100)]
Merge commit '9272c965d9559a90ee64d46aebd99c117e07f7a3'

* commit '9272c965d9559a90ee64d46aebd99c117e07f7a3':
  matroskaenc: Fix type used for chapter timestamps

Conflicts:
libavformat/matroskaenc.c

See: a4cd057bc7ddd2dd094d2ae7b0d6843ade95a626
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'dc2d0e06af459af9a7f91b65e0a3119acc4f1baa'
Michael Niedermayer [Wed, 11 Mar 2015 18:58:43 +0000 (19:58 +0100)]
Merge commit 'dc2d0e06af459af9a7f91b65e0a3119acc4f1baa'

* commit 'dc2d0e06af459af9a7f91b65e0a3119acc4f1baa':
  mlpdec: support TrueHD streams with an Atmos substream

See: 36bf549b2706bd10014556a84a33ed6daf5d5373
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'f36f6a608b5b2c17f8876195c61621c8f8607cee'
Michael Niedermayer [Wed, 11 Mar 2015 18:50:08 +0000 (19:50 +0100)]
Merge commit 'f36f6a608b5b2c17f8876195c61621c8f8607cee'

* commit 'f36f6a608b5b2c17f8876195c61621c8f8607cee':
  mlpdec: support major sync headers with optional extension blocks

See: ff34b2d6d35b212523428b9b932cce4914f7ac03
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoqsv: Improve the log message of when initializing MFX_IMPL_HARDWARE{2, 3, 4}
Yukinori Yamazoe [Wed, 11 Mar 2015 09:04:30 +0000 (18:04 +0900)]
qsv: Improve the log message of when initializing MFX_IMPL_HARDWARE{2, 3, 4}

Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agoavcodec/mpegvideo_motion: Fix undefined shifts in mpeg_motion_internal()
Michael Niedermayer [Wed, 11 Mar 2015 18:03:16 +0000 (19:03 +0100)]
avcodec/mpegvideo_motion: Fix undefined shifts in mpeg_motion_internal()

Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoconfigure: Enable colored output for gcc 4.9+
Vittorio Giovara [Mon, 9 Mar 2015 01:02:01 +0000 (01:02 +0000)]
configure: Enable colored output for gcc 4.9+

4 years agortpdec_vp9: Drop extra sanity check for size of input packet
Vittorio Giovara [Mon, 9 Mar 2015 17:27:22 +0000 (17:27 +0000)]
rtpdec_vp9: Drop extra sanity check for size of input packet

In this case len is always at least 1, since it is checked against
RTP_VP9_DESC_REQUIRED_SIZE + 1 and then it is reduced by
RTP_VP9_DESC_REQUIRED_SIZE before entering the has_pic_id check.

Bug-Id: CID 1270811

4 years agomp3: Properly use AVCodecContext API
Vittorio Giovara [Mon, 9 Mar 2015 23:02:00 +0000 (23:02 +0000)]
mp3: Properly use AVCodecContext API

Rather than having an unitialized context on the stack, allocate it with
defaults and free it when unneeded.

CC: libav-stable@libav.org
4 years agoavcodec/h264dsp_template: Fix undefined shift in biweight_h264_pixels and weight_h264...
Michael Niedermayer [Wed, 11 Mar 2015 17:49:57 +0000 (18:49 +0100)]
avcodec/h264dsp_template: Fix undefined shift in biweight_h264_pixels and weight_h264_pixels

Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agomatroskaenc: Fix type used for chapter timestamps
Vittorio Giovara [Wed, 11 Mar 2015 14:56:52 +0000 (14:56 +0000)]
matroskaenc: Fix type used for chapter timestamps

4 years agoavcodec/mpegvideo: Fix undefined shift in ff_mpv_lowest_referenced_row()
Michael Niedermayer [Wed, 11 Mar 2015 16:59:59 +0000 (17:59 +0100)]
avcodec/mpegvideo: Fix undefined shift in ff_mpv_lowest_referenced_row()

Also moves the shift out of the inner loop

Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/vp8: Fix undefined shifts in vp8_mc_luma()
Michael Niedermayer [Wed, 11 Mar 2015 15:55:07 +0000 (16:55 +0100)]
avcodec/vp8: Fix undefined shifts in vp8_mc_luma()

Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/golomb: Fix undefined shifts in unsigned rice decoding code
Michael Niedermayer [Wed, 11 Mar 2015 15:47:13 +0000 (16:47 +0100)]
avcodec/golomb: Fix undefined shifts in unsigned rice decoding code

Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/amrnbde: Fix undefined shift in decode_pitch_vector()
Michael Niedermayer [Wed, 11 Mar 2015 15:28:06 +0000 (16:28 +0100)]
avcodec/amrnbde: Fix undefined shift in decode_pitch_vector()

This also simplifies the code

Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agomlpdec: support TrueHD streams with an Atmos substream
Hendrik Leppkes [Fri, 26 Sep 2014 11:49:21 +0000 (13:49 +0200)]
mlpdec: support TrueHD streams with an Atmos substream

The fourth substream is being discarded, since its not raw audio data,
but an encoded Atmos stream which needs a specialized decoder.

Fixes decoding of the true hd stream from Transformers\ -\ Age\ of\ Extinction\ 2014\ 1080P-003.mkv

Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agomlpdec: support major sync headers with optional extension blocks
Hendrik Leppkes [Fri, 26 Sep 2014 11:49:20 +0000 (13:49 +0200)]
mlpdec: support major sync headers with optional extension blocks

Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agoswscale/utils: Fix undefined shift in initFilter()
Michael Niedermayer [Wed, 11 Mar 2015 14:40:28 +0000 (15:40 +0100)]
swscale/utils: Fix undefined shift in initFilter()

Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/wma: Fix undefined shift in ff_wma_run_level_decode()
Michael Niedermayer [Wed, 11 Mar 2015 12:32:08 +0000 (13:32 +0100)]
avcodec/wma: Fix undefined shift in ff_wma_run_level_decode()

Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/vc1_pred: Fix undefined shift in ff_vc1_pred_mv()
Michael Niedermayer [Wed, 11 Mar 2015 12:16:47 +0000 (13:16 +0100)]
avcodec/vc1_pred: Fix undefined shift in ff_vc1_pred_mv()

Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mpeg12dec: Fix undefined shift
Michael Niedermayer [Wed, 11 Mar 2015 03:24:57 +0000 (04:24 +0100)]
avcodec/mpeg12dec: Fix undefined shift

Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agox86: Makefile: fix DBG parameter evaluation
Christophe Gisquet [Sun, 8 Mar 2015 16:54:25 +0000 (17:54 +0100)]
x86: Makefile: fix DBG parameter evaluation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavf/libssh: support reading config from ~/.ssh/config
Florian Jacob [Wed, 11 Mar 2015 00:13:44 +0000 (01:13 +0100)]
lavf/libssh: support reading config from ~/.ssh/config

libssh provides a function for parsing ~/.ssh/config for ssh connection parameters like user, hostname, identity file
and port. This patch makes ffmpeg use this function to take parameters from the config file for everything that's not
explicitely set in the url. It also supports host aliases, i.e. using a shorthand in the url and replacing it with the
hostname / IP address specified for the shorthand in the config file.

Signed-off-by: Florian Jacob <projects+ffmpeg@florianjacob.de>
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
4 years agoavcodec/012v: redesign main loop
Michael Niedermayer [Tue, 10 Mar 2015 18:18:34 +0000 (19:18 +0100)]
avcodec/012v: redesign main loop

Fixes out of array accesses
Fixes: ffmpeg_012v_crash.ts

Found-by: Thomas Lindroth <thomas.lindroth@gmail.com>
Reviewed-by: Thomas Lindroth <thomas.lindroth@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavfi/boxblur: Fix colourpsace list.
Carl Eugen Hoyos [Tue, 10 Mar 2015 21:55:30 +0000 (22:55 +0100)]
lavfi/boxblur: Fix colourpsace list.

Fixes ticket #4363.

4 years agoavcodec/h264: Fix undefined shifts in pack16to32() and pack8to16()
Michael Niedermayer [Tue, 10 Mar 2015 20:15:05 +0000 (21:15 +0100)]
avcodec/h264: Fix undefined shifts in pack16to32() and pack8to16()

Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mpegvideo: Fix undefined shifts in ff_init_block_index()
Michael Niedermayer [Tue, 10 Mar 2015 20:15:05 +0000 (21:15 +0100)]
avcodec/mpegvideo: Fix undefined shifts in ff_init_block_index()

Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/012v: Check dimensions more completely
Michael Niedermayer [Tue, 10 Mar 2015 19:21:14 +0000 (20:21 +0100)]
avcodec/012v: Check dimensions more completely

Fixes division by 0

Found-by: Thomas Lindroth <thomas.lindroth@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/aeval: Fixed a memory leak in EvalContext::channel_values
Ole Andre Birkedal [Tue, 10 Mar 2015 13:12:30 +0000 (14:12 +0100)]
avfilter/aeval: Fixed a memory leak in EvalContext::channel_values

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoForce -D__EXTENSIONS__ on Solaris.
Carl Eugen Hoyos [Tue, 10 Mar 2015 12:36:49 +0000 (13:36 +0100)]
Force -D__EXTENSIONS__ on Solaris.

This fixes compilation of libavformat/udp.o on some installations,
regression since 3a5cbc91
Reported by Cristian Dustinta for SunOS 5.10

4 years agolavc/hevcdsp: Fix compilation for arm with --disable-neon.
Carl Eugen Hoyos [Tue, 10 Mar 2015 11:14:16 +0000 (12:14 +0100)]
lavc/hevcdsp: Fix compilation for arm with --disable-neon.

4 years agolavd/avfoundation: Silence warnings when compiling for iOS.
Carl Eugen Hoyos [Tue, 10 Mar 2015 11:08:29 +0000 (12:08 +0100)]
lavd/avfoundation: Silence warnings when compiling for iOS.

Reviewed-by: Thilo Borgmann
4 years agolavd/avfoundation: Silence c99 warnings when using gcc.
Carl Eugen Hoyos [Tue, 10 Mar 2015 11:08:02 +0000 (12:08 +0100)]
lavd/avfoundation: Silence c99 warnings when using gcc.

Reviewed-by: Thilo Borgmann
4 years agolavd/qtkit: Silence deprecation warnings when using clang.
Carl Eugen Hoyos [Tue, 10 Mar 2015 11:04:35 +0000 (12:04 +0100)]
lavd/qtkit: Silence deprecation warnings when using clang.

Reviewed-by: Thilo Borgmann
4 years agoMerge commit '448c8cfe4c53e9e806effd8505b46d57fa707061'
Michael Niedermayer [Tue, 10 Mar 2015 10:42:44 +0000 (11:42 +0100)]
Merge commit '448c8cfe4c53e9e806effd8505b46d57fa707061'

* commit '448c8cfe4c53e9e806effd8505b46d57fa707061':
  movenc: Support setting fragment_index before the moov atom is written

Conflicts:
libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '0c5e380c2c266d2e8a13c000cc527529db837f10'
Michael Niedermayer [Tue, 10 Mar 2015 10:27:03 +0000 (11:27 +0100)]
Merge commit '0c5e380c2c266d2e8a13c000cc527529db837f10'

* commit '0c5e380c2c266d2e8a13c000cc527529db837f10':
  movenc: Don't rely on the fragment index for vc1 info gathering

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'cf402d6fa88acd647cdff993429583bec8a34fdc'
Michael Niedermayer [Tue, 10 Mar 2015 10:17:28 +0000 (11:17 +0100)]
Merge commit 'cf402d6fa88acd647cdff993429583bec8a34fdc'

* commit 'cf402d6fa88acd647cdff993429583bec8a34fdc':
  rtpenc_mpegts: Set chain->rtp_ctx only after avformat_write_header succeeded

Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'c83dd2d2a458075a58895c384372f57c1ec26276'
Michael Niedermayer [Tue, 10 Mar 2015 10:08:30 +0000 (11:08 +0100)]
Merge commit 'c83dd2d2a458075a58895c384372f57c1ec26276'

* commit 'c83dd2d2a458075a58895c384372f57c1ec26276':
  rtpenc_mpegts: Free the right ->pb in the error path in the init function

Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '96a06dbaf278e8152487e08772946f63bd2a3843'
Michael Niedermayer [Tue, 10 Mar 2015 09:58:44 +0000 (10:58 +0100)]
Merge commit '96a06dbaf278e8152487e08772946f63bd2a3843'

* commit '96a06dbaf278e8152487e08772946f63bd2a3843':
  FATE: add support for testing hwaccels

Conflicts:
tests/Makefile
tests/fate-run.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'dc7536ca3d2dbe47f40cc0fcd0fc2555a84d5f56'
Michael Niedermayer [Tue, 10 Mar 2015 09:48:46 +0000 (10:48 +0100)]
Merge commit 'dc7536ca3d2dbe47f40cc0fcd0fc2555a84d5f56'

* commit 'dc7536ca3d2dbe47f40cc0fcd0fc2555a84d5f56':
  avconv: do not abort immediately if initializing hwaccel fails

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agomovenc: Support setting fragment_index before the moov atom is written
Martin Storsjö [Tue, 20 Jan 2015 14:33:12 +0000 (15:33 +0100)]
movenc: Support setting fragment_index before the moov atom is written

This way, the caller doesn't need to coordinate setting the option
after the moov atom has been written. The downside is that it is
no longer possible to use the option for checking whether the moov
atom already has been written, but a caller is able to keep track
of that by other means anyway.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agomovenc: Don't rely on the fragment index for vc1 info gathering
Martin Storsjö [Tue, 20 Jan 2015 14:54:03 +0000 (15:54 +0100)]
movenc: Don't rely on the fragment index for vc1 info gathering

The previous use of the mov->fragments field, for determining whether
written packets were part of the first fragment or not, didn't
work as intended when using the empty_moov flag.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortpenc_mpegts: Set chain->rtp_ctx only after avformat_write_header succeeded
Martin Storsjö [Mon, 9 Mar 2015 21:14:19 +0000 (23:14 +0200)]
rtpenc_mpegts: Set chain->rtp_ctx only after avformat_write_header succeeded

By making sure we at each time only have one pointer set, either a
local variable or one in the context, we avoid potential double frees
in the cleanup routines. If chain->rtp_ctx is set, it is closed by
calling avformat_write_trailer, but that shouldn't be called unless
avformat_write_header succeeded.

This issue was pointed out by Andreas Cadhalpun.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortpenc_mpegts: Free the right ->pb in the error path in the init function
Martin Storsjö [Mon, 9 Mar 2015 21:09:10 +0000 (23:09 +0200)]
rtpenc_mpegts: Free the right ->pb in the error path in the init function

This fixes a typo from 8e32b1f096.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoFATE: add support for testing hwaccels
Anton Khirnov [Mon, 9 Mar 2015 09:56:54 +0000 (10:56 +0100)]
FATE: add support for testing hwaccels

4 years agoavconv: do not abort immediately if initializing hwaccel fails
Anton Khirnov [Mon, 9 Mar 2015 09:54:00 +0000 (10:54 +0100)]
avconv: do not abort immediately if initializing hwaccel fails

exit_program() will try to free the decoders, which is not a good idea
from within get_format().
Return an error instead.

4 years agoavfilter/vf_fftfilt: increase RDFT length by 10%
Michael Niedermayer [Tue, 10 Mar 2015 02:32:38 +0000 (03:32 +0100)]
avfilter/vf_fftfilt: increase RDFT length by 10%

This fixes artifacts when the dimensions are exact powers of 2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibavformat/mxfenc: write package name metadata
Mark Reid [Thu, 5 Mar 2015 18:59:11 +0000 (10:59 -0800)]
libavformat/mxfenc: write package name metadata

Previous-version-reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoasfenc: fix leaking asf->index_ptr on error
Andreas Cadhalpun [Mon, 9 Mar 2015 18:31:39 +0000 (19:31 +0100)]
asfenc: fix leaking asf->index_ptr on error

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoroqvideoenc: set enc->avctx in roq_encode_init
Andreas Cadhalpun [Mon, 9 Mar 2015 18:24:09 +0000 (19:24 +0100)]
roqvideoenc: set enc->avctx in roq_encode_init

So far it is only set in roq_encode_frame, but it is used in
roq_encode_end to free the coded_frame. This currently segfaults if
roq_encode_frame is not called between roq_encode_init and
roq_encode_end.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>