ffmpeg.git
4 years agocrypto_bench: add support for xtea
James Almer [Sun, 2 Aug 2015 18:29:35 +0000 (15:29 -0300)]
crypto_bench: add support for xtea

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agocrypto_bench: add support for rc4
James Almer [Sun, 2 Aug 2015 18:23:35 +0000 (15:23 -0300)]
crypto_bench: add support for rc4

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agocrypto_bench: add support for blowfish
James Almer [Sun, 2 Aug 2015 18:13:13 +0000 (15:13 -0300)]
crypto_bench: add support for blowfish

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoavcodec/tiff: Support uncompressed G3 CCITT fax
Michael Niedermayer [Thu, 13 Aug 2015 15:02:05 +0000 (17:02 +0200)]
avcodec/tiff: Support uncompressed G3 CCITT fax

Fixes part of Ticket700

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/faxcompr: Support uncompressed escapes in decode_group3_1d_line()
Michael Niedermayer [Thu, 13 Aug 2015 15:01:11 +0000 (17:01 +0200)]
avcodec/faxcompr: Support uncompressed escapes in decode_group3_1d_line()

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/tiff: Support uncompressed G4 CCITT fax
Michael Niedermayer [Thu, 13 Aug 2015 14:11:23 +0000 (16:11 +0200)]
avcodec/tiff: Support uncompressed G4 CCITT fax

Fixes part of ticket700

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/faxcompr: Support cmode == 9 && xxx == 7
Michael Niedermayer [Thu, 13 Aug 2015 14:11:00 +0000 (16:11 +0200)]
avcodec/faxcompr: Support cmode == 9 && xxx == 7

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/faxcompr: Print the unsupported mode number
Michael Niedermayer [Thu, 13 Aug 2015 12:33:39 +0000 (14:33 +0200)]
avcodec/faxcompr: Print the unsupported mode number

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/wavdec: Detect wrongly interpreted specification about the sample value...
Michael Niedermayer [Thu, 13 Aug 2015 10:14:53 +0000 (12:14 +0200)]
avformat/wavdec: Detect wrongly interpreted specification about the sample value in the fact chunk

Fixes Ticket703

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/wavdec: Do not discard sample_count due to rounding
Michael Niedermayer [Thu, 13 Aug 2015 10:13:51 +0000 (12:13 +0200)]
avformat/wavdec: Do not discard sample_count due to rounding

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/tls_gnutls: correct version detection for certificate support
Ganesh Ajjanagadde [Thu, 13 Aug 2015 00:06:22 +0000 (20:06 -0400)]
avformat/tls_gnutls: correct version detection for certificate support

Fixes Ticket3748

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/dvbsubdec: Print field lens in case they are too lerge
Michael Niedermayer [Wed, 12 Aug 2015 23:50:08 +0000 (01:50 +0200)]
avcodec/dvbsubdec: Print field lens in case they are too lerge

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavisynth: fix setting stream timebase
Marton Balint [Mon, 10 Aug 2015 20:09:52 +0000 (22:09 +0200)]
avisynth: fix setting stream timebase

Stream timebase should be set using avpriv_set_pts_info, otherwise
avctx->pkt_timebase is not correct.

This should fix ticket #4766.

Patch is only compile tested.

Signed-off-by: Marton Balint <cus@passwd.hu>
Reviewed-by: Stephen Hutchinson <qyot27@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agomovtextdec: Use default style information from movtext header
Niklesh [Wed, 12 Aug 2015 12:54:32 +0000 (18:24 +0530)]
movtextdec: Use default style information from movtext header

As suggested, posting the combined patch with the fate changes.
The patch sets the default style in ASS from the default style
information present in the movtext header.

Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
4 years agoavcodec/mpeg12dec: Check chroma_format
Michael Niedermayer [Wed, 12 Aug 2015 20:26:41 +0000 (22:26 +0200)]
avcodec/mpeg12dec: Check chroma_format

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/avidec: Simplify dshow_block_align based special case detection
Michael Niedermayer [Wed, 12 Aug 2015 20:18:58 +0000 (22:18 +0200)]
avformat/avidec: Simplify dshow_block_align based special case detection

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavfilter: add aphasemeter filter
Paul B Mahol [Tue, 11 Aug 2015 14:37:45 +0000 (16:37 +0200)]
avfilter: add aphasemeter filter

4 years agoavformat: Move MAX_PROBE_PACKETS to internal.h
Michael Niedermayer [Sun, 9 Aug 2015 21:09:41 +0000 (23:09 +0200)]
avformat: Move MAX_PROBE_PACKETS to internal.h

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit 'ab43beefab9147673e09679e04be08431684a5db'
Hendrik Leppkes [Wed, 12 Aug 2015 10:40:45 +0000 (12:40 +0200)]
Merge commit 'ab43beefab9147673e09679e04be08431684a5db'

* commit 'ab43beefab9147673e09679e04be08431684a5db':
  x86inc: Drop SECTION_TEXT macro

See f0b7882ceb791ff32267ad97bd21a09e9cbf83d5

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

* commit '1c6bb813284732d9a1acacfe99522d9f66ebf73e':
  x86inc: Disable vpbroadcastq workaround in newer yasm versions

See f151fbd9e58c7af6535efb342d868bf803afef34

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

* commit 'f5e486f6f8c242bb2be01ad3ae952b5733ba1113':
  x86inc: Fix instantiation of YMM registers

See e93d3a22cb53bd88f551c1ad05cf3db3d453a396

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

* commit 'b114d28a18050b5ebd22fc067332e5487243889c':
  x86inc: warn when instructions incompatible with current cpuflags are used

See a1684311b3de0766932c42b1ffdd59823d786bc2

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

* commit '9f1245eb9620a70feaa00ba745c6c7a56a839556':
  x86inc: Support arbitrary stack alignments

See 826790f59640a84813e8dd81c2bba559516f8e4d

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

* commit '8c75ba55a4367c854b577c849ea2195bd78c4c81':
  x86inc: warn if XOP integer FMA instruction emulation is impossible

See 8db0f71b49a360dd64ae482fa4244db055f117eb

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

* commit '8f4a06faf45c1cbcabec610f4b47824171379934':
  checkasm: Remove unnecessary include

See 5e8e121fccc247942a42b609f1e32060950c1a65

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

* commit '4a53c758d2f69302e6822b23f3e7349253b9e8d3':
  x86: dcadsp: Avoid SSE2 instructions in SSE functions

See fc7e02f0ff345d5331b7c78f2400668d2c79a8b0

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agodoc/ffmpeg,doc/ffplay: reference timespec definitions
Ganesh Ajjanagadde [Tue, 11 Aug 2015 17:00:46 +0000 (13:00 -0400)]
doc/ffmpeg,doc/ffplay: reference timespec definitions

Reference time definition syntax in option descriptions when appropriate.

Fixes trac ticket #4595.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
4 years agolibavcodec/tableprint_vlc.h: include lavu/reverse.c for ff_reverse.
Alexis Ballier [Wed, 12 Aug 2015 09:36:38 +0000 (11:36 +0200)]
libavcodec/tableprint_vlc.h: include lavu/reverse.c for ff_reverse.

Fixes the build with --enable-hardcoded-tables since ff_reverse has moved to lavu.

4 years agoavformat/avidec: Disable AVSTREAM_PARSE_TIMESTAMPS for flac
Michael Niedermayer [Wed, 12 Aug 2015 01:43:41 +0000 (03:43 +0200)]
avformat/avidec: Disable AVSTREAM_PARSE_TIMESTAMPS for flac

The flac parser does not support it, its also not needed.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/avidec: Add flac to the dshow_block_align exception list
Michael Niedermayer [Wed, 12 Aug 2015 01:11:15 +0000 (03:11 +0200)]
avformat/avidec: Add flac to the dshow_block_align exception list

Fixes Ticket4758

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/gsm_parser: Replace codec_id check by assert
Michael Niedermayer [Tue, 11 Aug 2015 22:16:13 +0000 (00:16 +0200)]
avcodec/gsm_parser: Replace codec_id check by assert

A parser should never be called with a mismatching codec

Found-by: Ganesh Ajjanagadde <gajjanag@mit.edu>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavutil: add ff_reverse as av_reverse replacement
Andreas Cadhalpun [Sat, 8 Aug 2015 08:41:34 +0000 (10:41 +0200)]
avutil: add ff_reverse as av_reverse replacement

The table is used in libavutil/eval.c.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
4 years agoffmpeg: replace deprecated av_log_ask_for_sample with av_log
Andreas Cadhalpun [Sat, 8 Aug 2015 08:41:32 +0000 (10:41 +0200)]
ffmpeg: replace deprecated av_log_ask_for_sample with av_log

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

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
4 years agotests/fate-run: make FATE non-interactive
Ganesh Ajjanagadde [Fri, 31 Jul 2015 12:39:00 +0000 (08:39 -0400)]
tests/fate-run: make FATE non-interactive

FATE is non-interactive; it should not listen to user commands

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
This should fix leaving the terminal in a messed up state with
zsh in case of crashes during fate

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/g729_parser: Replace codec_id check by assert
Michael Niedermayer [Tue, 11 Aug 2015 20:53:36 +0000 (22:53 +0200)]
avcodec/g729_parser: Replace codec_id check by assert

A parser should never be called with a mismatching codec

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/g729: add g729_parser
Ganesh Ajjanagadde [Tue, 11 Aug 2015 17:04:09 +0000 (13:04 -0400)]
avcodec/g729: add g729_parser

Add trivial g729 parser; fixes Ticket4753

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agolavc: Remove newline from avpriv_request_sample() calls.
Carl Eugen Hoyos [Tue, 11 Aug 2015 20:50:45 +0000 (22:50 +0200)]
lavc: Remove newline from avpriv_request_sample() calls.

4 years agoavfilter/vsrc_testsrc: correct colors for smptebars
Paul B Mahol [Sun, 9 Aug 2015 11:15:58 +0000 (13:15 +0200)]
avfilter/vsrc_testsrc: correct colors for smptebars

4 years agodoc/ffmpeg: correct minor typo
Ganesh Ajjanagadde [Tue, 11 Aug 2015 02:38:08 +0000 (22:38 -0400)]
doc/ffmpeg: correct minor typo

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agolibavcodec/qsvdec.c: Extended error messages for MFXVideoDECODE_Init() result
Ivan Uskov [Thu, 6 Aug 2015 13:30:42 +0000 (09:30 -0400)]
libavcodec/qsvdec.c: Extended error messages for MFXVideoDECODE_Init() result

Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agommaldec: fix problems with flush logic
wm4 [Tue, 11 Aug 2015 10:11:04 +0000 (12:11 +0200)]
mmaldec: fix problems with flush logic

Don't try to do a blocking wait for MMAL output if we haven't even sent
a single real packet, but only flush packets. Obviously we can't expect
to get anything back.

Additionally, don't send a flush packet to MMAL in the same case. It
appears the MMAL decoder will sometimes hang in mmal_vc_port_disable()
(called from ffmmal_close_decoder()), waiting for a reply from the GPU
which never arrives. Either MMAL disallows sending flush packets without
preceding real data, or it's a MMAL bug.

4 years agommaldec: do not mutate user's AVCodecContext extradata field
wm4 [Tue, 11 Aug 2015 09:30:25 +0000 (11:30 +0200)]
mmaldec: do not mutate user's AVCodecContext extradata field

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 agox86inc: Drop SECTION_TEXT macro
Henrik Gramner [Sat, 1 Aug 2015 15:27:36 +0000 (17:27 +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`.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agox86inc: Disable vpbroadcastq workaround in newer yasm versions
Henrik Gramner [Sat, 1 Aug 2015 15:27:35 +0000 (17:27 +0200)]
x86inc: Disable vpbroadcastq workaround in newer yasm versions

The bug was fixed in 1.3.0, so only perform the workaround in earlier versions.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agox86inc: Fix instantiation of YMM registers
Christophe Gisquet [Sat, 1 Aug 2015 15:27:34 +0000 (17:27 +0200)]
x86inc: Fix instantiation of YMM registers

Signed-off-by: Henrik Gramner <henrik@gramner.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agox86inc: warn when instructions incompatible with current cpuflags are used
Anton Mitrofanov [Sat, 1 Aug 2015 15:27:33 +0000 (17:27 +0200)]
x86inc: warn when instructions incompatible with current cpuflags are used

Signed-off-by: Henrik Gramner <henrik@gramner.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agox86inc: Support arbitrary stack alignments
Henrik Gramner [Sat, 1 Aug 2015 15:27:32 +0000 (17:27 +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.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agox86inc: warn if XOP integer FMA instruction emulation is impossible
Anton Mitrofanov [Sat, 1 Aug 2015 15:27:31 +0000 (17:27 +0200)]
x86inc: warn if XOP integer FMA instruction emulation is impossible

Emulation requires a temporary register if arguments 1 and 4 are the same; this
doesn't obey the semantics of the original instruction, so we can't emulate
that in x86inc.

Also add pmacsdql emulation.

Signed-off-by: Henrik Gramner <henrik@gramner.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agocheckasm: Remove unnecessary include
Henrik Gramner [Wed, 5 Aug 2015 21:27:41 +0000 (23:27 +0200)]
checkasm: Remove unnecessary include

Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agox86: dcadsp: Avoid SSE2 instructions in SSE functions
Henrik Gramner [Sat, 1 Aug 2015 15:10:22 +0000 (17:10 +0200)]
x86: dcadsp: Avoid SSE2 instructions in SSE functions

Signed-off-by: Anton Khirnov <anton@khirnov.net>
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>