ffmpeg.git
4 years agommaldec: hack against buffering problems on broken input
wm4 [Tue, 11 Aug 2015 09:26:19 +0000 (11:26 +0200)]
mmaldec: hack against buffering problems on broken input

I can't come up with a nice way to handle this. It's hard to keep the
lock-stepped input/output in this case. You can't predict whether the
MMAL decoder will output a picture (because it's asynchronous), so
you have to assume in general that any packet could produce 0 or 1
frames. You can't continue to write input packets to the decoder,
because then you might get too many output frames, which you can't
get rid of because the lavc decoding API does not allow the decoder
to return an output frame without consuming an input frame (except
when flushing).

The ideal fix is a M:N decoding API (preferably asynchronous), which
would make this code potentially much cleaner. For now, this hack
will do.

4 years agoconcatdec: fix broken file_inpoint calculation
Marton Balint [Sat, 8 Aug 2015 11:56:42 +0000 (13:56 +0200)]
concatdec: fix broken file_inpoint calculation

Should fix ticket #4765.

Signed-off-by: Marton Balint <cus@passwd.hu>
4 years agoaacenc: Move small misc. functions to a separate file
Rostislav Pehlivanov [Wed, 29 Jul 2015 04:44:27 +0000 (05:44 +0100)]
aacenc: Move small misc. functions to a separate file

As well as tables littered everywhere, functions were spread
out all across the encoder's files. This moves them to a single
place where they can be used by either the encoder's main files
or additional encoder files. Additionally, it changes the type
of some to 'inline' to enable us to simply put them in a header
file and possibly gain some speed due to compiler optimizations.

Signed-off-by: Claudio Freire <klaussfreire@gmail.com>
4 years agodoc/codecs: Document color_range for the input side
Michael Niedermayer [Tue, 11 Aug 2015 01:56:42 +0000 (03:56 +0200)]
doc/codecs: Document color_range for the input side

Partly fixes Ticket 443

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/ftp: Use av_freep() for dir_buffer
Michael Niedermayer [Mon, 10 Aug 2015 16:46:38 +0000 (18:46 +0200)]
avformat/ftp: Use av_freep() for dir_buffer

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agolavf/ftp: properly read an empty path
Mariusz Szczepańczyk [Sun, 9 Aug 2015 00:38:11 +0000 (02:38 +0200)]
lavf/ftp: properly read an empty path

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agolavf/ftp: implement directory listing callbacks
Lukasz Marek [Sun, 9 Aug 2015 00:38:10 +0000 (02:38 +0200)]
lavf/ftp: implement directory listing callbacks

Signed-off-by: Lukasz Marek <lukasz.m.luki2 at gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/mjpegenc_common: do not ignore the color_range field
Michael Niedermayer [Mon, 10 Aug 2015 15:35:31 +0000 (17:35 +0200)]
avcodec/mjpegenc_common: do not ignore the color_range field

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavfilter/vsrc_testsrc: smpte(hd)bars: fix uninitialized last rows and columns of...
Paul B Mahol [Mon, 10 Aug 2015 09:17:52 +0000 (11:17 +0200)]
avfilter/vsrc_testsrc: smpte(hd)bars: fix uninitialized last rows and columns of chroma planes

For cases width and/or height is not multiple of chroma subsamplings.

4 years agoMerge commit '5f200bbf98efe50f63d0515b115d2ba8dae297bc'
Hendrik Leppkes [Mon, 10 Aug 2015 09:24:30 +0000 (11:24 +0200)]
Merge commit '5f200bbf98efe50f63d0515b115d2ba8dae297bc'

* commit '5f200bbf98efe50f63d0515b115d2ba8dae297bc':
  movenc: Place the sidx index after the initial moov/mdat pair

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '83f254e65f938657a4dbec711e4c94252a72daf9'
Hendrik Leppkes [Mon, 10 Aug 2015 09:23:21 +0000 (11:23 +0200)]
Merge commit '83f254e65f938657a4dbec711e4c94252a72daf9'

* commit '83f254e65f938657a4dbec711e4c94252a72daf9':
  movenc: Rename reserved_moov_pos to reserved_header_pos

Conflicts:
libavformat/movenc.c
libavformat/movenc.h

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '8e34089e265a6b01e1e3301e8864439d26793753'
Hendrik Leppkes [Mon, 10 Aug 2015 09:20:09 +0000 (11:20 +0200)]
Merge commit '8e34089e265a6b01e1e3301e8864439d26793753'

* commit '8e34089e265a6b01e1e3301e8864439d26793753':
  movenc: Check that frag_info entries exist in mov_write_sidx_tag

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '1542ec96389f32e5081c6c607e4b6f5e257ccdf2'
Hendrik Leppkes [Mon, 10 Aug 2015 09:16:27 +0000 (11:16 +0200)]
Merge commit '1542ec96389f32e5081c6c607e4b6f5e257ccdf2'

* commit '1542ec96389f32e5081c6c607e4b6f5e257ccdf2':
  cosmetics: Drop spurious spaces from if clauses

Conflicts:
libavcodec/vc1_block.c

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '0f562f5b833d603e04123d198c59f8b2b5eb43e4'
Hendrik Leppkes [Mon, 10 Aug 2015 09:11:42 +0000 (11:11 +0200)]
Merge commit '0f562f5b833d603e04123d198c59f8b2b5eb43e4'

* commit '0f562f5b833d603e04123d198c59f8b2b5eb43e4':
  h264: Do not print an error when the buffer has to be refilled

Conflicts:
libavcodec/h264.c

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agomovenc: Place the sidx index after the initial moov/mdat pair
Martin Storsjö [Sun, 9 Aug 2015 19:40:39 +0000 (22:40 +0300)]
movenc: Place the sidx index after the initial moov/mdat pair

For fragmented files with non-empty moov, with a fragment index
(sidx), place the index after the initial moov/mdat pair.

Previously, for this pathological case, the index was written
at the start of the file.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agomovenc: Rename reserved_moov_pos to reserved_header_pos
Martin Storsjö [Sun, 9 Aug 2015 19:39:28 +0000 (22:39 +0300)]
movenc: Rename reserved_moov_pos to reserved_header_pos

The same field is also used for writing the sidx index header,
for fragmented files, when the faststart flag is used.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agomovenc: Check that frag_info entries exist in mov_write_sidx_tag
Martin Storsjö [Sun, 9 Aug 2015 19:36:25 +0000 (22:36 +0300)]
movenc: Check that frag_info entries exist in mov_write_sidx_tag

This fixes crashes with pathological cases when trying to write
a sidx index (via the -movflags faststart option, in combination
with fragmenting options), when no fragments actually have been
written. (This is possible if the empty_moov flag isn't used,
so that all actual packet data is written in the moov/mdat pair,
and no moof/mdat pairs have been written.)

In these pathological cases, no sidx should be written at all.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoavformat/gifdec: correct r_frame_rate for single frame gifs
Michael Niedermayer [Mon, 10 Aug 2015 02:18:21 +0000 (04:18 +0200)]
avformat/gifdec: correct r_frame_rate for single frame gifs

Fixes Ticket4650

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agopostproc: Deprecate QP_STORE_T, it lacks a PP/AV/FF prefix
Michael Niedermayer [Sun, 9 Aug 2015 21:44:59 +0000 (23:44 +0200)]
postproc: Deprecate QP_STORE_T, it lacks a PP/AV/FF prefix

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoRevert "movtextdec: Use default style information from movtext header"
Michael Niedermayer [Mon, 10 Aug 2015 00:09:14 +0000 (02:09 +0200)]
Revert "movtextdec: Use default style information from movtext header"

The commit broke  sub-movtext and sub-subripenc
fate output differs between mips ad x86 so updating fate ref is not
possible

This reverts commit d670848d4c2757068ff43a68c05d01b28c809fb4.

4 years agomovtextdec: Use default style information from movtext header
Niklesh [Sun, 9 Aug 2015 19:43:43 +0000 (01:13 +0530)]
movtextdec: Use default style information from movtext header

Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
4 years agoffplay: increase MIN_FRAMES to 25
Marton Balint [Sat, 8 Aug 2015 11:23:14 +0000 (13:23 +0200)]
ffplay: increase MIN_FRAMES to 25

FFplay was using a 5 frame packet buffer, this is not much (e.g. 200 ms for
25fps video), when HLS is requesting a new segment via HTTP, it may take longer
for the request to complete.

Should fix ticket #4720.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
4 years agoffplay: add specific constants for buffer fullness settings when using external clock
Marton Balint [Sat, 8 Aug 2015 19:07:44 +0000 (21:07 +0200)]
ffplay: add specific constants for buffer fullness settings when using external clock

Signed-off-by: Marton Balint <cus@passwd.hu>
4 years agoavcodec: loongson optimize h264qpel with mmi v1
周晓勇 [Thu, 6 Aug 2015 13:27:52 +0000 (21:27 +0800)]
avcodec: loongson optimize h264qpel with mmi v1

Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoswscale/alphablend: Support chroma subsampling
Michael Niedermayer [Sun, 9 Aug 2015 15:48:58 +0000 (17:48 +0200)]
swscale/alphablend: Support chroma subsampling

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoswscale/alphablend: Support SWS_ALPHA_BLEND_CHECKERBOARD
Michael Niedermayer [Sun, 9 Aug 2015 15:11:53 +0000 (17:11 +0200)]
swscale/alphablend: Support SWS_ALPHA_BLEND_CHECKERBOARD

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoswscale/alphablend: Factor target computation out of the loops
Michael Niedermayer [Sun, 9 Aug 2015 14:09:30 +0000 (16:09 +0200)]
swscale/alphablend: Factor target computation out of the loops

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoswscale/alphablend: Fix big endian formats on LE
Michael Niedermayer [Sun, 9 Aug 2015 13:59:12 +0000 (15:59 +0200)]
swscale/alphablend: Fix big endian formats on LE

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoswscale/alphablend: support packed pixel formats
Michael Niedermayer [Sat, 8 Aug 2015 09:24:26 +0000 (11:24 +0200)]
swscale/alphablend: support packed pixel formats

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/snowenc: Avoid use of deprecated me_method
Michael Niedermayer [Sun, 9 Aug 2015 11:56:22 +0000 (13:56 +0200)]
avcodec/snowenc: Avoid use of deprecated me_method

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoswscale/swscale: Document param[0..1]
Michael Niedermayer [Sun, 9 Aug 2015 00:27:09 +0000 (02:27 +0200)]
swscale/swscale: Document param[0..1]

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agographdump: include internal.h for AVFilterPad
Andreas Cadhalpun [Sat, 8 Aug 2015 08:41:31 +0000 (10:41 +0200)]
graphdump: include internal.h for AVFilterPad

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
4 years agouse avfilter_pad_get_{type,name} accessor functions
Andreas Cadhalpun [Sat, 8 Aug 2015 08:41:31 +0000 (10:41 +0200)]
use avfilter_pad_get_{type,name} accessor functions

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
4 years agoavfilter: remove obsolete function declarations
Andreas Cadhalpun [Sat, 8 Aug 2015 08:41:31 +0000 (10:41 +0200)]
avfilter: remove obsolete function declarations

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
4 years agoavcodec: add missing FF_API_CODEC_ID guard
Andreas Cadhalpun [Sat, 8 Aug 2015 08:41:29 +0000 (10:41 +0200)]
avcodec: add missing FF_API_CODEC_ID guard

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
4 years agocmdutils: remove sws_opts usage, simplify code
Michael Niedermayer [Sat, 8 Aug 2015 14:47:21 +0000 (16:47 +0200)]
cmdutils: remove sws_opts usage, simplify code

It has become unused as all code was switched to AVDictionary

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agocmdutils: Fix overriding flags on the command line.
Michael Niedermayer [Sat, 8 Aug 2015 12:56:29 +0000 (14:56 +0200)]
cmdutils: Fix overriding flags on the command line.

Previously the code just appended the strings of flags which
worked with "+bitexact" but would not work with something like "0"

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoffmpeg: switch swscale option handling to AVDictionary similar to what the other...
Michael Niedermayer [Sat, 8 Aug 2015 11:33:46 +0000 (13:33 +0200)]
ffmpeg: switch swscale option handling to AVDictionary similar to what the other subsystems use

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavfilter/vf_scale: apply generic options after flags.
Michael Niedermayer [Sat, 8 Aug 2015 12:43:12 +0000 (14:43 +0200)]
avfilter/vf_scale: apply generic options after flags.

Otherwise the flags overwrite anything set by the generic stuff to the flags

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoffplay: pass all sws options to the filter graph
Michael Niedermayer [Sat, 8 Aug 2015 10:44:25 +0000 (12:44 +0200)]
ffplay: pass all sws options to the filter graph

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agocmdutils: Export all sws options using a AVDictionary like the other subsystems do
Michael Niedermayer [Sat, 8 Aug 2015 10:43:10 +0000 (12:43 +0200)]
cmdutils: Export all sws options using a AVDictionary like the other subsystems do

This makes extracting options other than sws_flags easier

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavfilter/graphparser: Do not ignore scale_sws_opts if args == NULL
Michael Niedermayer [Sat, 8 Aug 2015 10:40:34 +0000 (12:40 +0200)]
avfilter/graphparser: Do not ignore scale_sws_opts if args == NULL

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoswscale: Implement alphablendaway for planar 4:4:4 formats
Michael Niedermayer [Thu, 6 Aug 2015 14:36:05 +0000 (16:36 +0200)]
swscale: Implement alphablendaway for planar 4:4:4 formats

Fixes Ticket4746

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoswscale: Add sws_alloc_set_opts()
Michael Niedermayer [Sat, 8 Aug 2015 10:36:49 +0000 (12:36 +0200)]
swscale: Add sws_alloc_set_opts()

This simplifies allocating and initializing swscale contexts with custom options.
The function is internal currently but could be moved into the public header

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agolavc: The h263 encoder (also) depends on h263data.o
Carl Eugen Hoyos [Sat, 8 Aug 2015 10:11:33 +0000 (12:11 +0200)]
lavc: The h263 encoder (also) depends on h263data.o

4 years agoconfigure: mpegvideo depends on mpeg_er.
Carl Eugen Hoyos [Sat, 8 Aug 2015 09:02:25 +0000 (11:02 +0200)]
configure: mpegvideo depends on mpeg_er.

Fixes compilation with --disable-everything --enable-encoder=mjpeg
While there, clean up some recursive dependencies.
Reported-by: Bernhard Döbler, programmer bardware de
4 years agotests/api/api-h264-test: structure changes to avoid duplicate code
Ludmila Glinskih [Mon, 3 Aug 2015 19:49:21 +0000 (22:49 +0300)]
tests/api/api-h264-test: structure changes to avoid duplicate code

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agomovtextdec: Fix memory leaks by freeing mem allocs correctly
Niklesh [Fri, 7 Aug 2015 15:20:14 +0000 (20:50 +0530)]
movtextdec: Fix memory leaks by freeing mem allocs correctly

Initialize m->count_f to 0 at the correct place to free memory allocs properly.

Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
4 years agocosmetics: Drop spurious spaces from if clauses
Paolo Bizzarri [Fri, 7 Aug 2015 19:55:28 +0000 (21:55 +0200)]
cosmetics: Drop spurious spaces from if clauses

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agoavutil/float_dsp: Remove use of deprecated av_set_cpu_flags_mask()
Michael Niedermayer [Fri, 7 Aug 2015 12:35:32 +0000 (14:35 +0200)]
avutil/float_dsp: Remove use of deprecated av_set_cpu_flags_mask()

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/libopenh264enc: Avoid usage of deprecated ff_alloc_packet()
Michael Niedermayer [Fri, 7 Aug 2015 12:18:23 +0000 (14:18 +0200)]
avcodec/libopenh264enc: Avoid usage of deprecated ff_alloc_packet()

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavfilter/avf_avectorscope: stop making output fully transparent
Paul B Mahol [Fri, 7 Aug 2015 14:44:19 +0000 (16:44 +0200)]
avfilter/avf_avectorscope: stop making output fully transparent

4 years agoMerge commit '9469370fb32679352e66826daf77bdd2e6f067b5'
Hendrik Leppkes [Fri, 7 Aug 2015 07:54:12 +0000 (09:54 +0200)]
Merge commit '9469370fb32679352e66826daf77bdd2e6f067b5'

* commit '9469370fb32679352e66826daf77bdd2e6f067b5':
  h264: Use AVERROR return codes instead of -1

Only partially merged, as the first hunk is not correct and would result
in endless log spam.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'e5997152f54f790229c99f237f8eb6b5b1ee683a'
Hendrik Leppkes [Fri, 7 Aug 2015 07:27:55 +0000 (09:27 +0200)]
Merge commit 'e5997152f54f790229c99f237f8eb6b5b1ee683a'

* commit 'e5997152f54f790229c99f237f8eb6b5b1ee683a':
  asf: Use time_t where needed

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '944f60866f507e3c0850ae9c2f30dac1da54587c'
Hendrik Leppkes [Fri, 7 Aug 2015 07:27:49 +0000 (09:27 +0200)]
Merge commit '944f60866f507e3c0850ae9c2f30dac1da54587c'

* commit '944f60866f507e3c0850ae9c2f30dac1da54587c':
  asfdec: read values properly

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoaacenc: Move local encoder specific tables to a separate file
Rostislav Pehlivanov [Wed, 29 Jul 2015 04:44:26 +0000 (05:44 +0100)]
aacenc: Move local encoder specific tables to a separate file

This commit moves any tables specific to the encoder from aacenc
and aaccoder to a separate file called 'aacenctab.c/.h'.
This was done as a clean up attempt as the encoder was filled with
tables pasted in between functions which made it confusing to follow
and track where each table and definition had been used.
This commit solves this by simply exporting the smaller tables out to
the aacenctab.h while the larger ones are compiled using aacenctab.c
and are referenced from the header file.

Signed-off-by: Claudio Freire <klaussfreire@gmail.com>
4 years agox86/sbrdsp: remove an unnecessary mova in sbr_autocorrelate
James Almer [Mon, 3 Aug 2015 22:25:43 +0000 (19:25 -0300)]
x86/sbrdsp: remove an unnecessary mova in sbr_autocorrelate

Signed-off-by: James Almer <jamrial@gmail.com>
4 years agotests/fate/mp3: increase mp3-float-extra_overread FUZZ for ppc64be-RHEL7.0-gcc-4...
Michael Niedermayer [Fri, 7 Aug 2015 00:53:18 +0000 (02:53 +0200)]
tests/fate/mp3: increase mp3-float-extra_overread FUZZ for ppc64be-RHEL7.0-gcc-4.8.2-ibmcrl to 23 from 20

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/movtextdec: check that ftab has been allocated before dereferencing it
Michael Niedermayer [Thu, 6 Aug 2015 20:40:01 +0000 (22:40 +0200)]
avcodec/movtextdec: check that ftab has been allocated before dereferencing it

Fixes potential null pointer dereference on deallocation

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agomovtextdec.c: Add support for font names
Niklesh [Thu, 6 Aug 2015 03:41:12 +0000 (09:11 +0530)]
movtextdec.c: Add support for font names

Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
4 years agovc1dec: propagate error codes and return meaningful error codes
wm4 [Thu, 6 Aug 2015 09:20:25 +0000 (11:20 +0200)]
vc1dec: propagate error codes and return meaningful error codes

4 years agoavfilter/avf_showspectrum: use av_calloc()
Paul B Mahol [Thu, 6 Aug 2015 12:58:13 +0000 (14:58 +0200)]
avfilter/avf_showspectrum: use av_calloc()

4 years agoavcodec/diracdec: Move reference to DiracFrame, avoid use of the deprecated field...
Michael Niedermayer [Thu, 6 Aug 2015 10:43:35 +0000 (12:43 +0200)]
avcodec/diracdec: Move reference to DiracFrame, avoid use of the deprecated field from AVFrame

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/options: Silence deprecated warning about coded_frame
Michael Niedermayer [Thu, 6 Aug 2015 10:39:37 +0000 (12:39 +0200)]
avcodec/options: Silence deprecated warning about coded_frame

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoh264: Do not print an error when the buffer has to be refilled
Luca Barbato [Thu, 6 Aug 2015 09:55:48 +0000 (11:55 +0200)]
h264: Do not print an error when the buffer has to be refilled

Partially amends 9469370fb32679352e66826daf77bdd2e6f067b5

4 years agolavc: propagate hwaccel errors
wm4 [Wed, 5 Aug 2015 17:54:41 +0000 (19:54 +0200)]
lavc: propagate hwaccel errors

At least the new videotoolbox decoder does not actually set a frame if
end_frame fails. This causes the API to return success and signals that
a picture was decoded, even though AVFrame->data[0] is NULL.

Fix this by propagating end_frame errors.

4 years agoavformat/matroskaenc: Avoid "for (int i" syntax for better compatibility
Michael Niedermayer [Wed, 5 Aug 2015 23:15:08 +0000 (01:15 +0200)]
avformat/matroskaenc: Avoid "for (int i" syntax for better compatibility

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agocheckasm: Remove unnecessary include
Henrik Gramner [Wed, 5 Aug 2015 17:05:56 +0000 (19:05 +0200)]
checkasm: Remove unnecessary include

4 years agoavcodec: loongson optimized h264pred with mmi v2
周晓勇 [Tue, 4 Aug 2015 12:05:17 +0000 (20:05 +0800)]
avcodec: loongson optimized h264pred with mmi v2

Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agolibavformat/matroska: Write stream durations in metadata, in the format of mkvmerge.
Sasi Inguva [Wed, 5 Aug 2015 05:09:57 +0000 (22:09 -0700)]
libavformat/matroska: Write stream durations in metadata, in the format of mkvmerge.

Compute individual stream durations in matroska muxer.
Write them as string tags in the same format as mkvmerge tool does.

Signed-off-by: Sasi Inguva <isasi@google.com>
4 years agoffplay: do not block audio thread on WIN32
Marton Balint [Sun, 8 Feb 2015 18:30:46 +0000 (19:30 +0100)]
ffplay: do not block audio thread on WIN32

The windows SDL audio driver plays the old data in the buffer in a loop if it
is not updated in time. So instead of waiting for data and blocking the the
audio thread, return silence if no data is available.

Should fix ticket #2289.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
4 years agox86inc: warn if XOP integer FMA instruction emulation is impossible
Anton Mitrofanov [Fri, 14 Feb 2014 11:53:58 +0000 (13:53 +0200)]
x86inc: warn if XOP integer FMA instruction emulation is impossible

Signed-off-by: Henrik Gramner <henrik@gramner.com>
4 years agoavcodec/avcodec: Define CODEC_CAP_* based on AV_CODEC_CAP_*
Michael Niedermayer [Wed, 5 Aug 2015 13:04:02 +0000 (15:04 +0200)]
avcodec/avcodec: Define CODEC_CAP_* based on AV_CODEC_CAP_*

Avoid duplicating the literal numeric values

Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/avcodec: Replace AV_CODEC_FLAG* values by 1 << C style for consistency
Michael Niedermayer [Wed, 5 Aug 2015 13:24:59 +0000 (15:24 +0200)]
avcodec/avcodec: Replace AV_CODEC_FLAG* values by 1 << C style for consistency

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/hapenc: Remove use of deprecated ff_alloc_packet()
Michael Niedermayer [Wed, 5 Aug 2015 12:55:33 +0000 (14:55 +0200)]
avcodec/hapenc: Remove use of deprecated ff_alloc_packet()

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agovf_psnr: add psnr_avg to stats file.
Ronald S. Bultje [Wed, 5 Aug 2015 11:30:16 +0000 (07:30 -0400)]
vf_psnr: add psnr_avg to stats file.

4 years agoMerge commit 'b197f78329615893201c0e241d00b71b7c749dbb'
Hendrik Leppkes [Wed, 5 Aug 2015 10:19:07 +0000 (12:19 +0200)]
Merge commit 'b197f78329615893201c0e241d00b71b7c749dbb'

* commit 'b197f78329615893201c0e241d00b71b7c749dbb':
  configure: Silence error messages when probing compiler

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '98c9ade9853a9c413534ef243174d65f3f7506fa'
Hendrik Leppkes [Wed, 5 Aug 2015 10:18:31 +0000 (12:18 +0200)]
Merge commit '98c9ade9853a9c413534ef243174d65f3f7506fa'

* commit '98c9ade9853a9c413534ef243174d65f3f7506fa':
  drawtext: Move the strftime expansion in a separate function

Not merged, the code does not exist anymore.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'fe026ba960790a004adfcff33f44f96b05538e5c'
Hendrik Leppkes [Wed, 5 Aug 2015 10:15:41 +0000 (12:15 +0200)]
Merge commit 'fe026ba960790a004adfcff33f44f96b05538e5c'

* commit 'fe026ba960790a004adfcff33f44f96b05538e5c':
  drawtext: Drop stray guards

Conflicts:
libavfilter/vf_drawtext.c

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '4fee11ab05fc8569ef35c0ce86a60375c903eefb'
Hendrik Leppkes [Wed, 5 Aug 2015 10:10:08 +0000 (12:10 +0200)]
Merge commit '4fee11ab05fc8569ef35c0ce86a60375c903eefb'

* commit '4fee11ab05fc8569ef35c0ce86a60375c903eefb':
  png: Be more informative regarding signature errors

Conflicts:
libavcodec/pngdec.c

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoh264: Use AVERROR return codes instead of -1
Jake Sebastian-Jones [Wed, 5 Aug 2015 06:15:39 +0000 (16:15 +1000)]
h264: Use AVERROR return codes instead of -1

And report why it fails.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agoavcodec/dvbsubdec: Do not stop decoding at a invalid depth
Michael Niedermayer [Tue, 4 Aug 2015 21:43:57 +0000 (23:43 +0200)]
avcodec/dvbsubdec: Do not stop decoding at a invalid depth

This corrects parsing the later elements

Fixes Ticket4754

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoasf: Use time_t where needed
Luca Barbato [Tue, 4 Aug 2015 19:40:04 +0000 (21:40 +0200)]
asf: Use time_t where needed

gmtime takes a time_t not an uint64_t.

4 years agoavcodec/nvenc: Add support for 2pass rc in vbr mode
Timo Rothenpieler [Tue, 4 Aug 2015 17:57:10 +0000 (19:57 +0200)]
avcodec/nvenc: Add support for 2pass rc in vbr mode

Thanks to WereCatf for pointing out this now exists.

Github: Closes #143

4 years agoavcodec/nvenc: Only set h264 parameter when encoding h264
Timo Rothenpieler [Tue, 4 Aug 2015 17:49:42 +0000 (19:49 +0200)]
avcodec/nvenc: Only set h264 parameter when encoding h264

4 years agoavcodec/nvenc: Fix indentation
Timo Rothenpieler [Tue, 4 Aug 2015 17:47:32 +0000 (19:47 +0200)]
avcodec/nvenc: Fix indentation

4 years agowmv2enc: remove duplicate priv_class in codec definition
Hendrik Leppkes [Tue, 4 Aug 2015 19:34:16 +0000 (21:34 +0200)]
wmv2enc: remove duplicate priv_class in codec definition

4 years agolavf/swf: Fix auto-detection of compressed files.
Carl Eugen Hoyos [Tue, 4 Aug 2015 19:32:01 +0000 (21:32 +0200)]
lavf/swf: Fix auto-detection of compressed files.

Fixes auto-detection of compressed swf files as in
http://samples.ffmpeg.org/SWF/compressed-swf/
Reported by forum user Zard1096.

4 years agoasfdec: read values properly
Alexandra Hájková [Tue, 4 Aug 2015 10:46:27 +0000 (12:46 +0200)]
asfdec: read values properly

The length of BOOL values is 16 bits in the Metadata Object but
32 bits in the Extended Content Description Object.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agox86inc: Drop SECTION_TEXT macro
Henrik Gramner [Wed, 27 May 2015 19:38:14 +0000 (21:38 +0200)]
x86inc: Drop SECTION_TEXT macro

The .text section is already 16-byte aligned by default on all supported
platforms so `SECTION_TEXT` isn't any different from `SECTION .text`.

4 years agox86inc: Support arbitrary stack alignments
Henrik Gramner [Sun, 9 Feb 2014 22:58:04 +0000 (00:58 +0200)]
x86inc: Support arbitrary stack alignments

Change ALLOC_STACK to always align the stack before allocating stack space for
consistency. Previously alignment would occur either before or after allocating
stack space depending on whether manual alignment was required or not.

4 years agoffmpeg: remove access to private FILE struct members on Windows
Hendrik Leppkes [Mon, 3 Aug 2015 15:08:49 +0000 (17:08 +0200)]
ffmpeg: remove access to private FILE struct members on Windows

The FILE struct is opaque in MSVC 2015, and the members of this struct
were never meant to be accessed in any case.

No conditions are known where this check was needed to get characters
from stdin.

4 years agoffmpeg: avoid scanf in keyboard command parsing
Hendrik Leppkes [Mon, 3 Aug 2015 20:02:17 +0000 (22:02 +0200)]
ffmpeg: avoid scanf in keyboard command parsing

Mixing stdio and low-level IO on stdin is not safe.

4 years agoMAINTAINERS: Add myself to vdpau maintainers
Philip Langdale [Mon, 3 Aug 2015 15:19:54 +0000 (08:19 -0700)]
MAINTAINERS: Add myself to vdpau maintainers

4 years agoavcodec/vdpau_hevc: Properly signal the num_delta_pocs from the SPS RPS
Philip Langdale [Sat, 13 Jun 2015 17:53:42 +0000 (10:53 -0700)]
avcodec/vdpau_hevc: Properly signal the num_delta_pocs from the SPS RPS

This is the same fix that Hendrik made to dxva2_hevc. It should be
equally required here, although I don't see any visual difference.
Nevertheless, best to stay consistent.

4 years agoavcodec/vdpau_hevc: Remove experimental flag
Philip Langdale [Tue, 4 Aug 2015 03:58:05 +0000 (20:58 -0700)]
avcodec/vdpau_hevc: Remove experimental flag

The latest nvidia 355.06 drivers fixes the interleaving bug when
video surfaces are rendered. It still seems to be broken for
read-back with getBits but that's sufficiently uninteresting that
I don't think we need to wait for it to remove the flag.

4 years agoavcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for VP8 functions
Shivraj Patil [Tue, 4 Aug 2015 06:49:11 +0000 (12:19 +0530)]
avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for VP8 functions

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
4 years agoavfilter/avf_showspectrum: reindent
Paul B Mahol [Tue, 4 Aug 2015 13:18:51 +0000 (15:18 +0200)]
avfilter/avf_showspectrum: reindent

4 years agolavc/dvbsub: Do not fail on clut depth 0.
Carl Eugen Hoyos [Tue, 4 Aug 2015 13:01:22 +0000 (15:01 +0200)]
lavc/dvbsub: Do not fail on clut depth 0.

Fixes ticket #4752.

4 years agolavd/v4l2: Use AVSTREAM_PARSE_FULL_ONCE when reading a h264 stream.
Carl Eugen Hoyos [Tue, 4 Aug 2015 12:59:26 +0000 (14:59 +0200)]
lavd/v4l2: Use AVSTREAM_PARSE_FULL_ONCE when reading a h264 stream.

Reported, debugged and tested by trac user noah.
Fixes ticket #4644.