ffmpeg.git
4 years agoavfilter: handle error in query_formats() in bunch of filters
Paul B Mahol [Fri, 3 Apr 2015 17:55:18 +0000 (17:55 +0000)]
avfilter: handle error in query_formats() in bunch of filters

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavformat/libquvi: Fix whitelist handling
Gilles Chanteperdrix [Wed, 8 Apr 2015 12:38:11 +0000 (14:38 +0200)]
avformat/libquvi: Fix whitelist handling

Fixes null pointer dereference

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/h264_slice: Fix uninitialized variable
Michael Niedermayer [Wed, 8 Apr 2015 11:05:38 +0000 (13:05 +0200)]
avcodec/h264_slice: Fix uninitialized variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/h264_slice: Dont reset mb_aff_frame per slice
Michael Niedermayer [Wed, 8 Apr 2015 10:29:47 +0000 (12:29 +0200)]
avcodec/h264_slice: Dont reset mb_aff_frame per slice

Fixes null pointer dereference
Fixes Ticket4440

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/h264: use consistent argument name in MB_FIELD() macro
Michael Niedermayer [Wed, 8 Apr 2015 10:27:09 +0000 (12:27 +0200)]
avcodec/h264: use consistent argument name in MB_FIELD() macro

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibavcodec/hqx: correct clipping error
ferdo@bigroses.nl [Tue, 7 Apr 2015 10:42:17 +0000 (12:42 +0200)]
libavcodec/hqx: correct clipping error

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/segment: Change enum to int, which is accessed via AVOption as int
Michael Niedermayer [Tue, 7 Apr 2015 21:21:48 +0000 (23:21 +0200)]
avformat/segment: Change enum to int, which is accessed via AVOption as int

This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/ape: Use av_malloc_array()
Michael Niedermayer [Tue, 7 Apr 2015 20:50:07 +0000 (22:50 +0200)]
avformat/ape: Use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/asfenc: Check for index_ptr allocation failure
Michael Niedermayer [Tue, 7 Apr 2015 20:29:54 +0000 (22:29 +0200)]
avformat/asfenc: Check for index_ptr allocation failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agowebmdashenc: Fix fate in MSVC
Vignesh Venkatasubramanian [Tue, 7 Apr 2015 19:21:02 +0000 (12:21 -0700)]
webmdashenc: Fix fate in MSVC

MSVC does not support the %F and %T format specifiers in strftime.
Replace that with the expanded version. This fixes the broken fate
tests in MSVC (webm-dash-manifest-*).

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '27f274628234c1f934b9a6a6380ed567c1b4ceae'
Michael Niedermayer [Tue, 7 Apr 2015 18:34:24 +0000 (20:34 +0200)]
Merge commit '27f274628234c1f934b9a6a6380ed567c1b4ceae'

* commit '27f274628234c1f934b9a6a6380ed567c1b4ceae':
  parseutils: Make av_small_strptime public

Conflicts:
doc/APIchanges
libavformat/utils.c
libavutil/parseutils.c
libavutil/version.h

See: 29e972f67c914d35417bc7368493d2617abdd26e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '108f2f381acb93827fb4add0517eeae859afa3bf'
Michael Niedermayer [Tue, 7 Apr 2015 17:58:31 +0000 (19:58 +0200)]
Merge commit '108f2f381acb93827fb4add0517eeae859afa3bf'

* commit '108f2f381acb93827fb4add0517eeae859afa3bf':
  parseutils: Extend small_strptime to be used in avformat

Conflicts:
libavutil/parseutils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavf: Add support for WebM Live Muxing
Vignesh Venkatasubramanian [Mon, 30 Mar 2015 21:46:10 +0000 (14:46 -0700)]
lavf: Add support for WebM Live Muxing

This patch adds support for WebM Live Muxing by adding a new WebM
Chunk muxer. It writes out live WebM Chunks which can be used for
playback using Live DASH Clients.

Please see muxers.texi for sample usage.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoparseutils: Make av_small_strptime public
Luca Barbato [Sun, 5 Apr 2015 23:45:37 +0000 (01:45 +0200)]
parseutils: Make av_small_strptime public

And use it in libavformat.

Based on a similar patch by Stefano Sabatini <stefasab@gmail.com>.

4 years agoavcodec/h264: finish previous slices before switching to single thread mode
Michael Niedermayer [Tue, 7 Apr 2015 00:47:36 +0000 (02:47 +0200)]
avcodec/h264: finish previous slices before switching to single thread mode

Fixes null pointer dereference
Fixes Ticket4438

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/h264: Fix race between slices where one overwrites data from the next
Michael Niedermayer [Mon, 6 Apr 2015 22:40:21 +0000 (00:40 +0200)]
avcodec/h264: Fix race between slices where one overwrites data from the next

Fixes non deterministic crash in ticket4408/fuzz2.264
Likely fixes other samples as well

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agotests/fate/mpeg4: add bitexact flag so as to avoid the version number from being...
Michael Niedermayer [Mon, 6 Apr 2015 21:00:16 +0000 (23:00 +0200)]
tests/fate/mpeg4: add bitexact flag so as to avoid the version number from being included in the checksum

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agofate: add mpeg4_unpack_bframes bsf test
Andreas Cadhalpun [Sun, 5 Apr 2015 16:51:55 +0000 (18:51 +0200)]
fate: add mpeg4_unpack_bframes bsf test

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibavformat/http.c: Fix missing parenthesis in http_listen()
Stephan Holljes [Mon, 6 Apr 2015 17:26:34 +0000 (19:26 +0200)]
libavformat/http.c: Fix missing parenthesis in http_listen()

Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMAINTAINERS: Add Lou Logan as server admin as he is root too
Michael Niedermayer [Mon, 6 Apr 2015 18:21:43 +0000 (20:21 +0200)]
MAINTAINERS: Add Lou Logan as server admin as he is root too

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/pthread_frame: Fix memleak with frame threads and allocated AVOptions
Michael Niedermayer [Mon, 6 Apr 2015 16:18:41 +0000 (18:18 +0200)]
avcodec/pthread_frame: Fix memleak with frame threads and allocated AVOptions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoparseutils: Extend small_strptime to be used in avformat
Luca Barbato [Sun, 5 Apr 2015 23:25:52 +0000 (01:25 +0200)]
parseutils: Extend small_strptime to be used in avformat

The strptime implementation is supposed to support whitespace and %T.

4 years agoexamples/avio_list_dir: init/deinit network
Lukasz Marek [Fri, 3 Apr 2015 21:55:21 +0000 (23:55 +0200)]
examples/avio_list_dir: init/deinit network

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
4 years agoavcodec/vc1dec: Check buf2 for malloc failure
Michael Niedermayer [Mon, 6 Apr 2015 13:06:42 +0000 (15:06 +0200)]
avcodec/vc1dec: Check buf2 for malloc failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/af_amix: Use av_mallocz_array()
Michael Niedermayer [Mon, 6 Apr 2015 13:04:38 +0000 (15:04 +0200)]
avfilter/af_amix: Use av_mallocz_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vsrc_mptestsrc: Change enum to int, which is accessed via AVOption as int
Michael Niedermayer [Mon, 6 Apr 2015 12:45:17 +0000 (14:45 +0200)]
avfilter/vsrc_mptestsrc: Change enum to int, which is accessed via AVOption as int

This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/httpauth: Change enum to int, which is accessed via AVOption as int
Michael Niedermayer [Mon, 6 Apr 2015 12:44:33 +0000 (14:44 +0200)]
avformat/httpauth: Change enum to int, which is accessed via AVOption as int

This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/utils: avoid discarded streams in av_find_default_stream_index()
Michael Niedermayer [Mon, 6 Apr 2015 02:20:51 +0000 (04:20 +0200)]
avformat/utils: avoid discarded streams in av_find_default_stream_index()

Fixes Ticket2010

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_mpdecimate: Fix missing ()
Michael Niedermayer [Mon, 6 Apr 2015 00:41:49 +0000 (02:41 +0200)]
avfilter/vf_mpdecimate: Fix missing ()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavf/libsmbclient: implement directory listing callbacks
Mariusz Szczepańczyk [Fri, 3 Apr 2015 01:54:10 +0000 (03:54 +0200)]
lavf/libsmbclient: implement directory listing callbacks

Reviewed-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '249796e2560c2cce1add722c3e873de96b17be74'
Michael Niedermayer [Sun, 5 Apr 2015 23:37:34 +0000 (01:37 +0200)]
Merge commit '249796e2560c2cce1add722c3e873de96b17be74'

* commit '249796e2560c2cce1add722c3e873de96b17be74':
  svq3: initialize some required H264Context fields.

See: e6c710600e1d474b53e52398969140f79052bfde
See: aa000ddab2352b82b9ef7ec0974080065b7cc409
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswr/resample: use av_clip functions
James Almer [Sun, 5 Apr 2015 18:26:49 +0000 (15:26 -0300)]
swr/resample: use av_clip functions

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '5637ff01218a44fcc1fff9b4382a15a6470abcc9'
Michael Niedermayer [Sun, 5 Apr 2015 20:35:14 +0000 (22:35 +0200)]
Merge commit '5637ff01218a44fcc1fff9b4382a15a6470abcc9'

* commit '5637ff01218a44fcc1fff9b4382a15a6470abcc9':
  libavcodec: Clarify the documentation of the internal codec capability flags

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '31048d48b0410b9cfb6023054d81e627d01be342'
Michael Niedermayer [Sun, 5 Apr 2015 20:33:57 +0000 (22:33 +0200)]
Merge commit '31048d48b0410b9cfb6023054d81e627d01be342'

* commit '31048d48b0410b9cfb6023054d81e627d01be342':
  avcodec/libx265: export chosen picture types

See: 2ddedfd39c0d6b49e6396c535d5cb21846676a13
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'bd737b5178f361a9b592691848f29a7a79603a7e'
Michael Niedermayer [Sun, 5 Apr 2015 20:25:22 +0000 (22:25 +0200)]
Merge commit 'bd737b5178f361a9b592691848f29a7a79603a7e'

* commit 'bd737b5178f361a9b592691848f29a7a79603a7e':
  h264: reset the private data in init_thread_copy()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'a939e5b2527d0c4628815b1d3d8e29ee921227e8'
Michael Niedermayer [Sun, 5 Apr 2015 20:18:32 +0000 (22:18 +0200)]
Merge commit 'a939e5b2527d0c4628815b1d3d8e29ee921227e8'

* commit 'a939e5b2527d0c4628815b1d3d8e29ee921227e8':
  h264: remove a commented out nonsense line

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/svq3: add scaling matrix init that was removed from h264 init
Michael Niedermayer [Sun, 5 Apr 2015 20:10:43 +0000 (22:10 +0200)]
avcodec/svq3: add scaling matrix init that was removed from h264 init

This is needed for svq3

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '65afa65e7393e7745427e267d6c6ca814c7c8b45'
Michael Niedermayer [Sun, 5 Apr 2015 20:04:46 +0000 (22:04 +0200)]
Merge commit '65afa65e7393e7745427e267d6c6ca814c7c8b45'

* commit '65afa65e7393e7745427e267d6c6ca814c7c8b45':
  h264: drop redundant initialization of the scaling matrices

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'e1f907711a91e5ce19402a1831cfbe8f709b67f7'
Michael Niedermayer [Sun, 5 Apr 2015 19:56:50 +0000 (21:56 +0200)]
Merge commit 'e1f907711a91e5ce19402a1831cfbe8f709b67f7'

* commit 'e1f907711a91e5ce19402a1831cfbe8f709b67f7':
  h264: factor out common code from init() and init_thread_copy()

Conflicts:
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/svq3: add initialization which was removed from h264 init
Michael Niedermayer [Sun, 5 Apr 2015 19:36:07 +0000 (21:36 +0200)]
avcodec/svq3: add initialization which was removed from h264 init

This is needed for the svq3 code to work

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '43fd3dd80ca2d1c2ccf6a7b7632db544c809c690'
Michael Niedermayer [Sun, 5 Apr 2015 19:11:25 +0000 (21:11 +0200)]
Merge commit '43fd3dd80ca2d1c2ccf6a7b7632db544c809c690'

* commit '43fd3dd80ca2d1c2ccf6a7b7632db544c809c690':
  h264: drop redundant initialization in init()

Conflicts:
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agosvq3: initialize some required H264Context fields.
Anton Khirnov [Sun, 5 Apr 2015 19:02:56 +0000 (21:02 +0200)]
svq3: initialize some required H264Context fields.

They are no longer initialized in ff_h264_decode_init() since 43fd3dd,
so svq3 needs to initialize the manually.

Fixes svq3 decoding, broken since 43fd3dd.

4 years agoMerge commit '050324d020f843ce333276ebb6f27cc6026f37d0'
Michael Niedermayer [Sun, 5 Apr 2015 18:55:42 +0000 (20:55 +0200)]
Merge commit '050324d020f843ce333276ebb6f27cc6026f37d0'

* commit '050324d020f843ce333276ebb6f27cc6026f37d0':
  h264: initialize cur_chroma_format_idc

See: a51fbb56bb9352476affaef1fc6773c8b059db91 / 137df692fc28710aa1a21856b1f5b9e157896fef
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '84f226a3bcd8b39801a4c9051c033ab7d61aaf76'
Michael Niedermayer [Sun, 5 Apr 2015 18:43:32 +0000 (20:43 +0200)]
Merge commit '84f226a3bcd8b39801a4c9051c033ab7d61aaf76'

* commit '84f226a3bcd8b39801a4c9051c033ab7d61aaf76':
  h264: use the correct SPS during PPS parsing

Conflicts:
libavcodec/h264_ps.c

See: dc35b77b28f40c99d27c073fe2c22219ba600202
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibavcodec: Clarify the documentation of the internal codec capability flags
Martin Storsjö [Thu, 2 Apr 2015 12:17:01 +0000 (15:17 +0300)]
libavcodec: Clarify the documentation of the internal codec capability flags

The previous documentation was very vague and almost misleading.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoavcodec/libx265: export chosen picture types
Michael Niedermayer [Mon, 30 Mar 2015 22:37:46 +0000 (00:37 +0200)]
avcodec/libx265: export chosen picture types

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoavfilter/yadif: Change enums to int, which are accessed via AVOption as int
Michael Niedermayer [Sun, 5 Apr 2015 13:46:11 +0000 (15:46 +0200)]
avfilter/yadif: Change enums to int, which are accessed via AVOption as int

This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vsrc_mandelbrot: Change enums to int, which are accessed via AVOption as int
Michael Niedermayer [Sun, 5 Apr 2015 13:44:59 +0000 (15:44 +0200)]
avfilter/vsrc_mandelbrot: Change enums to int, which are accessed via AVOption as int

This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agompeg4: suggest mpeg4_unpack_bframes bsf instead of avidemux/VirtualDub
Andreas Cadhalpun [Fri, 3 Apr 2015 17:15:15 +0000 (19:15 +0200)]
mpeg4: suggest mpeg4_unpack_bframes bsf instead of avidemux/VirtualDub

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/error_resilience: Avoid race with updating the error_count
Michael Niedermayer [Sat, 4 Apr 2015 09:46:09 +0000 (11:46 +0200)]
avcodec/error_resilience: Avoid race with updating the error_count

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoh264: reset the private data in init_thread_copy()
Anton Khirnov [Sun, 29 Mar 2015 10:26:45 +0000 (12:26 +0200)]
h264: reset the private data in init_thread_copy()

The generic code copies the main context's private data to all the
others. However that is quite dangerous, as it might end up copying some
pointers that are or will become invalid.

Since everything we actually need will be copied later in
update_thread_context(), it's safest to zero the private data in
init_thread_copy(), so it works the same way as init for the main
context.

4 years agoh264: remove a commented out nonsense line
Anton Khirnov [Sun, 29 Mar 2015 10:19:24 +0000 (12:19 +0200)]
h264: remove a commented out nonsense line

4 years agoh264: drop redundant initialization of the scaling matrices
Anton Khirnov [Sun, 29 Mar 2015 10:18:36 +0000 (12:18 +0200)]
h264: drop redundant initialization of the scaling matrices

It will always be initialized when actually parsing the PPS.

4 years agoh264: factor out common code from init() and init_thread_copy()
Anton Khirnov [Mon, 23 Mar 2015 04:46:49 +0000 (05:46 +0100)]
h264: factor out common code from init() and init_thread_copy()

4 years agoh264: drop redundant initialization in init()
Anton Khirnov [Sat, 21 Mar 2015 15:12:44 +0000 (16:12 +0100)]
h264: drop redundant initialization in init()

There is no real advantage to initializing any of those in init,
assuming yuv420, before the real stream parameters are known.

4 years agoh264: initialize cur_chroma_format_idc
Anton Khirnov [Sat, 21 Mar 2015 15:08:18 +0000 (16:08 +0100)]
h264: initialize cur_chroma_format_idc

This makes sure the various DSP contexts get properly initialized in
ff_h264_set_parameter_from_sps() whatever the value of
raw_bits_per_sample.

4 years agoh264: use the correct SPS during PPS parsing
Anton Khirnov [Fri, 6 Mar 2015 15:03:51 +0000 (16:03 +0100)]
h264: use the correct SPS during PPS parsing

There is in general no reason for the currently active SPS to be the one
referenced by the PPS being parsed.

4 years agolavf/http: add proof-of-concept http server.
Stephan Holljes [Thu, 2 Apr 2015 20:49:07 +0000 (22:49 +0200)]
lavf/http: add proof-of-concept http server.

Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
Reviewed-By: Nicolas George <george@nsup.org>
4 years agoavcodec: add unpack packed B-frames bitstream filter
Andreas Cadhalpun [Fri, 3 Apr 2015 16:19:53 +0000 (18:19 +0200)]
avcodec: add unpack packed B-frames bitstream filter

Fixes Ticket #2913

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agowebmdashenc: Support for live stream manifests
Vignesh Venkatasubramanian [Wed, 1 Apr 2015 02:40:01 +0000 (19:40 -0700)]
webmdashenc: Support for live stream manifests

This patch adds support for creating DASH manifests for WebM Live
Streams. It also updates the documentation and adds a fate test to
verify the behavior of the new muxer flag.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'aa1a1b2496cf3ca817e78e27bd0262a50adb91a1'
Michael Niedermayer [Sat, 4 Apr 2015 22:55:04 +0000 (00:55 +0200)]
Merge commit 'aa1a1b2496cf3ca817e78e27bd0262a50adb91a1'

* commit 'aa1a1b2496cf3ca817e78e27bd0262a50adb91a1':
  avconv: Avoid theoretical NULL dereferences

See: d768f8f5cfe876cd8eedb045eeb87e307ac4a674
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agomatroskadec: Add support for parsing live header files
Vignesh Venkatasubramanian [Tue, 31 Mar 2015 23:51:57 +0000 (16:51 -0700)]
matroskadec: Add support for parsing live header files

This patch adds support for parsing live files (produced by
-f webm_chunk) which contains only the headers but no packets. This
is only used when using -f webm_dash_manifest. There will be a
follow up patch which adds live support to WebM DASH Manifest
muxer.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Sat, 4 Apr 2015 18:14:51 +0000 (20:14 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  lavf/mov: Do not overread iTunes metadata.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavconv: Avoid theoretical NULL dereferences
Himangi Saraogi [Wed, 1 Apr 2015 19:33:04 +0000 (01:03 +0530)]
avconv: Avoid theoretical NULL dereferences

Bug-Id: CID 1292519

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agoavcodec/h264_refs: More completely clear slice contexts in ff_h264_remove_all_refs()
Michael Niedermayer [Sat, 4 Apr 2015 17:30:10 +0000 (19:30 +0200)]
avcodec/h264_refs: More completely clear slice contexts in ff_h264_remove_all_refs()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/h264: Fail for invalid mixed IDR / non IDR frames in slice threading mode
Michael Niedermayer [Sat, 4 Apr 2015 17:28:33 +0000 (19:28 +0200)]
avcodec/h264: Fail for invalid mixed IDR / non IDR frames in slice threading mode

Fixes Ticket4408

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/h264_mb: assert that frame waiting code actually references 2 fields/1 frame
Michael Niedermayer [Sat, 4 Apr 2015 16:31:00 +0000 (18:31 +0200)]
avcodec/h264_mb: assert that frame waiting code actually references 2 fields/1 frame

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/h264_refs: Do not set reference to things which dont exist
Michael Niedermayer [Sat, 4 Apr 2015 16:08:23 +0000 (18:08 +0200)]
avcodec/h264_refs: Do not set reference to things which dont exist

Fixes deadlock
Fixes Ticket4428
Fixes Ticket4429

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavf/mov: Do not overread iTunes metadata.
Carl Eugen Hoyos [Sat, 4 Apr 2015 15:35:06 +0000 (17:35 +0200)]
lavf/mov: Do not overread iTunes metadata.

Fixes ticket #4425.

4 years agoavcodec/h264_slice: make current_slice reset code more strict
Michael Niedermayer [Sat, 4 Apr 2015 14:08:40 +0000 (16:08 +0200)]
avcodec/h264_slice: make current_slice reset code more strict

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/h264: use goto end instead of return for hwaccel fails as well
Michael Niedermayer [Sat, 4 Apr 2015 12:40:40 +0000 (14:40 +0200)]
avcodec/h264: use goto end instead of return for hwaccel fails as well

This is more correct

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/rtsp: Fix null pointer dereference
Himangi Saraogi [Sat, 4 Apr 2015 10:51:40 +0000 (16:21 +0530)]
avformat/rtsp: Fix null pointer dereference

This fixes CID 1257827.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavf/assenc: style nits
Rodger Combs [Sat, 4 Apr 2015 10:31:21 +0000 (05:31 -0500)]
lavf/assenc: style nits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agomatroskadec: export cover art correctly
wm4 [Fri, 3 Apr 2015 14:11:53 +0000 (16:11 +0200)]
matroskadec: export cover art correctly

Generally, libavformat exports cover art pictures as video streams with
1 packet and AV_DISPOSITION_ATTACHED_PIC set. Only matroskadec exported
it as attachment with codec_id set to AV_CODEC_ID_MJPEG.

Obviously, this should be consistent, so change the Matroska demuxer to
export a AV_DISPOSITION_ATTACHED_PIC pseudo video stream.

Matroska muxing is probably incorrect too. I know that it can create
broken files with an audio track and just 1 video frame when e.g.
remuxing mp3 with APIC to mkv. But for now this commit does not change
anything about muxing, and also continues to write attachments with
AV_CODEC_ID_MJPEG should the muxer application have special knowledge
that the Matroska is broken in this way.

Fixes trac #4423.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agompeg4: use a self-explanatory #define MAX_NVOP_SIZE
Andreas Cadhalpun [Fri, 3 Apr 2015 17:14:16 +0000 (19:14 +0200)]
mpeg4: use a self-explanatory #define MAX_NVOP_SIZE

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Sat, 4 Apr 2015 00:15:23 +0000 (02:15 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Fix codec fps diplay for very small fps.
  lavf/mpeg: Support alaw in Hikvision CCTV recordings.
  lavf/mpeg: Support more audio codecs in Hikvision CCTV recordings.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/h264: silence ER warning when no slice threads are used
Michael Niedermayer [Fri, 3 Apr 2015 23:58:37 +0000 (01:58 +0200)]
avcodec/h264: silence ER warning when no slice threads are used

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMAINTAINERS: add Reynaldo as a Twitter maintainer
Lou Logan [Fri, 3 Apr 2015 23:59:17 +0000 (15:59 -0800)]
MAINTAINERS: add Reynaldo as a Twitter maintainer

Signed-off-by: Lou Logan <lou@lrcd.com>
4 years agoavcodec/h264: reenable ER except with slice threads by default
Michael Niedermayer [Fri, 3 Apr 2015 23:02:29 +0000 (01:02 +0200)]
avcodec/h264: reenable ER except with slice threads by default

ER with slice threads is buggy and since the merge of the libav cleanup broken
as the ER context which is supposed to be per frame has been placed in
the slice context, so there are multiple per frame which does not work as is.

Theres no bug report about ER with frame threads. If someone knows of a
case where it crashes / fails without slice threads please mail me and
open a ticket on trac.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'a4d34e218f548d381e09c483e8dc6ad18a8d571c'
Michael Niedermayer [Fri, 3 Apr 2015 22:49:57 +0000 (00:49 +0200)]
Merge commit 'a4d34e218f548d381e09c483e8dc6ad18a8d571c'

* commit 'a4d34e218f548d381e09c483e8dc6ad18a8d571c':
  h264: disable ER by default

Conflicts:
libavcodec/h264.c
libavcodec/h264_picture.c
libavcodec/h264_slice.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '3892bdab9b652eb003ab95e167f1765e0b0ea035'
Michael Niedermayer [Fri, 3 Apr 2015 22:38:02 +0000 (00:38 +0200)]
Merge commit '3892bdab9b652eb003ab95e167f1765e0b0ea035'

* commit '3892bdab9b652eb003ab95e167f1765e0b0ea035':
  avconv: do not overwrite the stream codec context for streamcopy

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmpeg: Fix extradata allocation
Michael Niedermayer [Fri, 3 Apr 2015 21:44:38 +0000 (23:44 +0200)]
ffmpeg: Fix extradata allocation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agotests/fate/hevc: Use a bitexact scaler in the hevc param change test to avoid failing...
Michael Niedermayer [Fri, 3 Apr 2015 20:48:33 +0000 (22:48 +0200)]
tests/fate/hevc: Use a bitexact scaler in the hevc param change test to avoid failing on non x86

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'b2965ec7761c99e8ef9c217a28a517e37f010480'
Michael Niedermayer [Fri, 3 Apr 2015 20:23:52 +0000 (22:23 +0200)]
Merge commit 'b2965ec7761c99e8ef9c217a28a517e37f010480'

* commit 'b2965ec7761c99e8ef9c217a28a517e37f010480':
  FATE: add a test for parameter changes in HEVC

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'df528b11ac607de13a7c438f2a51f2119f71a03c'
Michael Niedermayer [Fri, 3 Apr 2015 20:16:10 +0000 (22:16 +0200)]
Merge commit 'df528b11ac607de13a7c438f2a51f2119f71a03c'

* commit 'df528b11ac607de13a7c438f2a51f2119f71a03c':
  hevc: make sure no dangling pointers remain around on VPS/SPS change

Conflicts:
libavcodec/hevc_ps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'ce0bc09ee2580d49fec90a6eb0de2ba1b580c854'
Michael Niedermayer [Fri, 3 Apr 2015 19:37:03 +0000 (21:37 +0200)]
Merge commit 'ce0bc09ee2580d49fec90a6eb0de2ba1b580c854'

* commit 'ce0bc09ee2580d49fec90a6eb0de2ba1b580c854':
  hevc: do not change the VPS if its contents are the same

Conflicts:
libavcodec/hevc_ps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '7693ba0a0eecdcdba71b7fbd9a4a12d1ba7b82aa'
Michael Niedermayer [Fri, 3 Apr 2015 19:29:50 +0000 (21:29 +0200)]
Merge commit '7693ba0a0eecdcdba71b7fbd9a4a12d1ba7b82aa'

* commit '7693ba0a0eecdcdba71b7fbd9a4a12d1ba7b82aa':
  hevc: export stream parameters from extradata

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoFix codec fps diplay for very small fps.
Carl Eugen Hoyos [Fri, 3 Apr 2015 19:07:06 +0000 (21:07 +0200)]
Fix codec fps diplay for very small fps.

Fixes codec banner for the sample from ticket #4369.

4 years agolavf/mpeg: Support alaw in Hikvision CCTV recordings.
Carl Eugen Hoyos [Fri, 3 Apr 2015 19:04:43 +0000 (21:04 +0200)]
lavf/mpeg: Support alaw in Hikvision CCTV recordings.

Fixes a sample from ticket #4182.

4 years agolavf/mpeg: Support more audio codecs in Hikvision CCTV recordings.
Carl Eugen Hoyos [Fri, 3 Apr 2015 18:58:20 +0000 (20:58 +0200)]
lavf/mpeg: Support more audio codecs in Hikvision CCTV recordings.

Fixes a sample from ticket #4182.

4 years agoMerge commit '1ae7afd256f9af1eb4f63f9adcf03d581ce4e2b5'
Michael Niedermayer [Fri, 3 Apr 2015 19:11:19 +0000 (21:11 +0200)]
Merge commit '1ae7afd256f9af1eb4f63f9adcf03d581ce4e2b5'

* commit '1ae7afd256f9af1eb4f63f9adcf03d581ce4e2b5':
  hevc: split out setting AVCodecContext parameters

Conflicts:
libavcodec/hevc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '7d097a0fc57f0fa8385962a539c657c2f40b5ed0'
Michael Niedermayer [Fri, 3 Apr 2015 18:53:52 +0000 (20:53 +0200)]
Merge commit '7d097a0fc57f0fa8385962a539c657c2f40b5ed0'

* commit '7d097a0fc57f0fa8385962a539c657c2f40b5ed0':
  mpegtsenc: Take max_delay into account when buffering multiple audio packets into one PES packet

Conflicts:
libavformat/mpegtsenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agocmdutils: fix "Commmand" typo
Lou Logan [Fri, 3 Apr 2015 18:43:21 +0000 (10:43 -0800)]
cmdutils: fix "Commmand" typo

Signed-off-by: Lou Logan <lou@lrcd.com>
4 years agompeg4: only show the divx_packed warning, when a packed frame is present
Andreas Cadhalpun [Fri, 3 Apr 2015 17:14:31 +0000 (19:14 +0200)]
mpeg4: only show the divx_packed warning, when a packed frame is present

Otherwise it is shown even after the file was fixed with avidemux,
because the userdata string still ends with 'p'.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmpeg: Fix indentation
Michael Niedermayer [Fri, 3 Apr 2015 17:39:06 +0000 (19:39 +0200)]
ffmpeg: Fix indentation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmpeg: last frame duplication heuristic
Michael Niedermayer [Wed, 19 Nov 2014 11:41:16 +0000 (12:41 +0100)]
ffmpeg: last frame duplication heuristic

This improves the last frames duration with CFR and when the input durations
are inaccurate or missing

Fixes Ticket4119

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/ppc/fdctdsp: POWER LE support in ff_fdct_altivec()
Rong Yan [Fri, 3 Apr 2015 12:36:18 +0000 (12:36 +0000)]
avcodec/ppc/fdctdsp: POWER LE support in ff_fdct_altivec()

add marcos VEC_FMERGEH() VEC_FMERGEL()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agofiltfmts: Avoid null pointer dereference
Himangi Saraogi [Fri, 3 Apr 2015 14:16:05 +0000 (19:46 +0530)]
filtfmts: Avoid null pointer dereference

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibavformat/mxf.c: Relaxed ProRes pattern
Steve Dierker [Thu, 2 Apr 2015 09:51:08 +0000 (11:51 +0200)]
libavformat/mxf.c: Relaxed ProRes pattern

I found another MXF File containing ProRes with the following
codec_uls: 060E2B34040101010E04020102110500
Therefor I relaxed the pattern.

Related to issue #4349

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoh264: disable ER by default
Anton Khirnov [Tue, 31 Mar 2015 08:35:15 +0000 (10:35 +0200)]
h264: disable ER by default

The way it is currently designed is fundamentally unsafe and cannot be
reasonably fixed without completely rewriting it.