ffmpeg.git
5 years agoavutil/file: add av_warn_unused_result to av_file_map
Ganesh Ajjanagadde [Thu, 15 Oct 2015 22:18:02 +0000 (18:18 -0400)]
avutil/file: add av_warn_unused_result to av_file_map

The return code here should be checked.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
5 years agoavutil/internal: add av_warn_unused_result to avpriv_open
Ganesh Ajjanagadde [Thu, 15 Oct 2015 21:49:48 +0000 (17:49 -0400)]
avutil/internal: add av_warn_unused_result to avpriv_open

The open syscall can obviously fail, and its return code needs to be
checked.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
5 years agoswscale/swscale: add av_warn_unused_result to sws_init_context
Ganesh Ajjanagadde [Fri, 16 Oct 2015 01:44:22 +0000 (21:44 -0400)]
swscale/swscale: add av_warn_unused_result to sws_init_context

This should not trigger any warnings; but adds robustness.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
5 years agoMerge commit '68e00ad66d13c57d9eb3a3862b44ab3fb030e19f'
Hendrik Leppkes [Fri, 16 Oct 2015 21:04:59 +0000 (23:04 +0200)]
Merge commit '68e00ad66d13c57d9eb3a3862b44ab3fb030e19f'

* commit '68e00ad66d13c57d9eb3a3862b44ab3fb030e19f':
  w32pthreads: fix mingw build on x86 with -msse2 or higher

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
5 years agoMerge commit 'b52307933b576eba741c80108c3dad09eb48ba12'
Hendrik Leppkes [Fri, 16 Oct 2015 21:04:46 +0000 (23:04 +0200)]
Merge commit 'b52307933b576eba741c80108c3dad09eb48ba12'

* commit 'b52307933b576eba741c80108c3dad09eb48ba12':
  wrapped_avframe: Drop a now-unused variable

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
5 years agoMerge commit '49d7fcd774ac31f242818ad9d45d9c013f3bb3db'
Hendrik Leppkes [Fri, 16 Oct 2015 21:04:14 +0000 (23:04 +0200)]
Merge commit '49d7fcd774ac31f242818ad9d45d9c013f3bb3db'

* commit '49d7fcd774ac31f242818ad9d45d9c013f3bb3db':
  mpeg12: Unbreak building stale code

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
5 years agoMerge commit '504e3f75bf73a488d39a80a42962bae2a353dd6b'
Hendrik Leppkes [Fri, 16 Oct 2015 21:03:49 +0000 (23:03 +0200)]
Merge commit '504e3f75bf73a488d39a80a42962bae2a353dd6b'

* commit '504e3f75bf73a488d39a80a42962bae2a353dd6b':
  aac: Make codec init run under ff_thread_once

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
5 years agoMerge commit '1f84b008bf2b1eaca473937c48788cb4e4ce1aea'
Hendrik Leppkes [Fri, 16 Oct 2015 21:00:11 +0000 (23:00 +0200)]
Merge commit '1f84b008bf2b1eaca473937c48788cb4e4ce1aea'

* commit '1f84b008bf2b1eaca473937c48788cb4e4ce1aea':
  fate: Move screenpresso to the appropriate screen capture file

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
5 years agoMerge commit '2d59159508c5c1830cc5da907a9454e229077320'
Hendrik Leppkes [Fri, 16 Oct 2015 20:58:24 +0000 (22:58 +0200)]
Merge commit '2d59159508c5c1830cc5da907a9454e229077320'

* commit '2d59159508c5c1830cc5da907a9454e229077320':
  lavc: AV-prefix a few left out capabilities

Not applied, since this change breaks compilation and is not correct.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
5 years agoMerge commit '9ef748173a4e0e58d40afaf38397783cd2537eaa'
Hendrik Leppkes [Fri, 16 Oct 2015 20:57:21 +0000 (22:57 +0200)]
Merge commit '9ef748173a4e0e58d40afaf38397783cd2537eaa'

* commit '9ef748173a4e0e58d40afaf38397783cd2537eaa':
  cmdutils: Print general codec capabilities

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
5 years agoMerge commit 'e240a28b20680b326a39b0860fda37d7e459bfc0'
Hendrik Leppkes [Fri, 16 Oct 2015 20:46:23 +0000 (22:46 +0200)]
Merge commit 'e240a28b20680b326a39b0860fda37d7e459bfc0'

* commit 'e240a28b20680b326a39b0860fda37d7e459bfc0':
  cmdutils: Add auto to threading capabilities report

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
5 years agoavcodec/ffv1dec: update progress in case of broken pointer chains
Michael Niedermayer [Fri, 16 Oct 2015 20:25:20 +0000 (22:25 +0200)]
avcodec/ffv1dec: update progress in case of broken pointer chains

Fixes deadlock
Fixes Ticket4932

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agoavcodec/ffv1dec: Clear slice coordinates if they are invalid or slice header decoding...
Michael Niedermayer [Fri, 16 Oct 2015 18:15:48 +0000 (20:15 +0200)]
avcodec/ffv1dec: Clear slice coordinates if they are invalid or slice header decoding fails for other reasons

Fixes Ticket4931

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agoavformat/rsd: propagate return values of extradata helper functions
James Almer [Fri, 16 Oct 2015 19:09:10 +0000 (16:09 -0300)]
avformat/rsd: propagate return values of extradata helper functions

They can return errors other than ENOMEM

Signed-off-by: James Almer <jamrial@gmail.com>
5 years agoavcodec/nvenc: fix b frame n_quant_offset
Agatha Hu [Fri, 16 Oct 2015 16:23:51 +0000 (18:23 +0200)]
avcodec/nvenc: fix b frame n_quant_offset

Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
5 years agow32pthreads: fix mingw build on x86 with -msse2 or higher
Hendrik Leppkes [Wed, 14 Oct 2015 21:18:17 +0000 (23:18 +0200)]
w32pthreads: fix mingw build on x86 with -msse2 or higher

When SSE2 or higher compiler optimizations are used, mingw uses
the _mm_mfence intrinsic for MemoryBarrier, however it doesn't include
the appropriate headers automatically.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agowrapped_avframe: Drop a now-unused variable
Luca Barbato [Fri, 16 Oct 2015 12:45:45 +0000 (14:45 +0200)]
wrapped_avframe: Drop a now-unused variable

5 years agompeg12: Unbreak building stale code
Luca Barbato [Fri, 16 Oct 2015 06:45:04 +0000 (08:45 +0200)]
mpeg12: Unbreak building stale code

Broken in 2d59159508c5c1830cc5da907a9454e229077320

5 years agoavformat: add svag demuxer
Paul B Mahol [Fri, 16 Oct 2015 12:01:53 +0000 (14:01 +0200)]
avformat: add svag demuxer

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavformat/rsd: add WADP support
Paul B Mahol [Thu, 15 Oct 2015 22:09:02 +0000 (00:09 +0200)]
avformat/rsd: add WADP support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavformat: add ads demuxer
Paul B Mahol [Wed, 14 Oct 2015 09:58:38 +0000 (11:58 +0200)]
avformat: add ads demuxer

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavformat: add vag demuxer
Paul B Mahol [Tue, 13 Oct 2015 10:52:54 +0000 (12:52 +0200)]
avformat: add vag demuxer

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavformat: add genh demuxer
Paul B Mahol [Mon, 12 Oct 2015 20:58:05 +0000 (22:58 +0200)]
avformat: add genh demuxer

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavcodec: add ADPCM PSX decoder
Paul B Mahol [Tue, 13 Oct 2015 12:16:24 +0000 (14:16 +0200)]
avcodec: add ADPCM PSX decoder

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavfilter/avfilter: Error out if audio parameters change instead of failing an assert
Michael Niedermayer [Thu, 15 Oct 2015 22:24:26 +0000 (00:24 +0200)]
avfilter/avfilter: Error out if audio parameters change instead of failing an assert

Filters which support such changes should be excluded from these checks

Fixes Ticket4884

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agow32pthreads: fix mingw build on x86 with -msse2 or higher
Hendrik Leppkes [Wed, 14 Oct 2015 21:20:09 +0000 (23:20 +0200)]
w32pthreads: fix mingw build on x86 with -msse2 or higher

When SSE2 or higher compiler optimizations are used, mingw uses
the _mm_mfence intrinsic for MemoryBarrier, however it doesn't include
the appropriate headers automatically.

5 years agovp9: use AVFrame.buf[0] to check if a frame is valid
Hendrik Leppkes [Thu, 15 Oct 2015 11:54:10 +0000 (13:54 +0200)]
vp9: use AVFrame.buf[0] to check if a frame is valid

AVFrame.data[0] is not guaranteed to be set with a HWAccel

5 years agofate: use PROGSSUF
Christophe Gisquet [Wed, 14 Oct 2015 17:18:27 +0000 (19:18 +0200)]
fate: use PROGSSUF

May require exporting in the shell var PROGSUF when invoking a
shell script.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agoavdevice/alsa: add av_warn_unused_result
Ganesh Ajjanagadde [Fri, 16 Oct 2015 01:57:38 +0000 (21:57 -0400)]
avdevice/alsa: add av_warn_unused_result

This does not trigger any warnings, but adds robustness.

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
5 years agoavutil/cast5: update Doxygen for av_cast5_init with return information
Ganesh Ajjanagadde [Thu, 15 Oct 2015 21:43:25 +0000 (17:43 -0400)]
avutil/cast5: update Doxygen for av_cast5_init with return information

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
5 years agoswresample/swresample_internal: add av_warn_unused_result
Ganesh Ajjanagadde [Fri, 16 Oct 2015 01:29:43 +0000 (21:29 -0400)]
swresample/swresample_internal: add av_warn_unused_result

This will trigger a few warnings that need to be fixed.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
5 years agoavutil/crc: use EINVAL instead of -1 for the return code of av_crc_init()
Michael Niedermayer [Fri, 16 Oct 2015 01:24:36 +0000 (03:24 +0200)]
avutil/crc: use EINVAL instead of -1 for the return code of av_crc_init()

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agoavcodec/jpeg2000dec: Clear properties in jpeg2000_dec_cleanup() too
Michael Niedermayer [Thu, 15 Oct 2015 19:48:42 +0000 (21:48 +0200)]
avcodec/jpeg2000dec: Clear properties in jpeg2000_dec_cleanup() too

Fixes: Ticket4878

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agomips: disable all features in configure if no cpu is matched
Vicente Olivert Riera [Wed, 14 Oct 2015 13:58:49 +0000 (14:58 +0100)]
mips: disable all features in configure if no cpu is matched

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agoRevert "avcodec/h264: remove redundant and bogus get_format call"
wm4 [Thu, 15 Oct 2015 18:19:55 +0000 (20:19 +0200)]
Revert "avcodec/h264: remove redundant and bogus get_format call"

This reverts commit be583c6fd3a6f06844b56619653b9b0e4561870d.

This was not approved, and was accidentally pushed. I'm very sorry.

5 years agoswresample: slightly nicer debug output for auto matrix
wm4 [Thu, 15 Oct 2015 17:07:27 +0000 (19:07 +0200)]
swresample: slightly nicer debug output for auto matrix

This is the matrix that will be used for up/downmixing.

5 years agoavcodec/h264: remove redundant and bogus get_format call
wm4 [Sun, 11 Oct 2015 17:02:40 +0000 (19:02 +0200)]
avcodec/h264: remove redundant and bogus get_format call

The AVCodecContext.get_format callback is not only used for pixel format
negotiation with the API user, but also for hwaccel init. For the
latter, it's required that some codec parameters, in particular the
codec profile, are set when the callback is invoked.

This patch removes a get_format invocation where this is not guaranteed.
The codec parameters, including the profile, are really set further
below. (The same code path that sets the profile also calls get_format
properly too.)

This just happened to work by coincidence in most cases. For example, if
the API user just copied or reused the AVStream's AVCodecContext when
decoding, the profile would be set properly. But in some cases it
fails., such as with the sample WolfensteinTwitch.mp4 on the samples
server.

Remove the redundant get_format call. Apparently it serves no purpose
anymore, although it is possible that this was different at the time it
was added in commit ffd77f94a26be22b8ead3178ceec3ed39e68abc5.

This fixes hwaccel usage for API users which do not set the profile
when setting up the AVCodecContext (which is allowed).

5 years agoaac: Make codec init run under ff_thread_once
Derek Buitenhuis [Wed, 14 Oct 2015 18:24:35 +0000 (14:24 -0400)]
aac: Make codec init run under ff_thread_once

This makes AAC init threadsafe.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoaac: Make codec init run under ff_thread_once
Derek Buitenhuis [Wed, 14 Oct 2015 18:25:51 +0000 (14:25 -0400)]
aac: Make codec init run under ff_thread_once

This makes AAC init threadsafe.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agowinrt: multithreading support
wang-bin [Tue, 29 Sep 2015 10:11:03 +0000 (18:11 +0800)]
winrt: multithreading support

_beginthreadex is for desktop only. CreateThread is available for windows store apps on windows (and phone) 8.1 and later. http://msdn.microsoft.com/en-us/library/ms682453%28VS.85%29.aspx

Signed-off-by: Matt Oliver <protogonoi@gmail.com>
5 years agofate: Move screenpresso to the appropriate screen capture file
Vittorio Giovara [Wed, 14 Oct 2015 13:13:11 +0000 (15:13 +0200)]
fate: Move screenpresso to the appropriate screen capture file

5 years agolavc: AV-prefix a few left out capabilities
Vittorio Giovara [Wed, 14 Oct 2015 13:08:49 +0000 (15:08 +0200)]
lavc: AV-prefix a few left out capabilities

5 years agocmdutils: Print general codec capabilities
Vittorio Giovara [Wed, 14 Oct 2015 13:07:10 +0000 (15:07 +0200)]
cmdutils: Print general codec capabilities

5 years agocmdutils: Add auto to threading capabilities report
Vittorio Giovara [Wed, 14 Oct 2015 13:07:09 +0000 (15:07 +0200)]
cmdutils: Add auto to threading capabilities report

And use 'none' when such capabilities are not set.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agoavformat/hls: add support for EXT-X-MAP
Anssi Hannula [Thu, 15 Oct 2015 11:23:00 +0000 (14:23 +0300)]
avformat/hls: add support for EXT-X-MAP

Without EXT-X-MAP support we miss the first bytes of some streams.

These streams worked by luck before byte-ranged segment support was added in
da7759b3579de3e98deb1ac58e642b861280ba54

Fixes ticket #4797.

5 years agoavformat/hls: fix segment selection regression on track changes of live streams
Anssi Hannula [Thu, 15 Oct 2015 10:42:38 +0000 (13:42 +0300)]
avformat/hls: fix segment selection regression on track changes of live streams

Commit ad701326b43078b90 ("avformat/hls: open playlists immediately when
AVDISCARD_ALL is dropped") inadvertently caused first_packet to never be
cleared, causing select_cur_seq_no() to not use the specific code for
live streams.

In practice this means that when the user selects a different audio
track during live stream (i.e. non-VOD) playback, there may be some
additional delay as the code might select an incorrect segment at first,
and we have to wait for video to catch audio (if too late segment was
selected) or to download more following audio segments (if too early
segment was selected).

Fix that by restoring the zeroing of first_packet.

5 years agovp9: expose reference frames in VP9SharedContext
Hendrik Leppkes [Wed, 14 Oct 2015 08:03:20 +0000 (10:03 +0200)]
vp9: expose reference frames in VP9SharedContext

5 years agovp9: split header into separate struct and expose in vp9.h
Ronald S. Bultje [Wed, 14 Oct 2015 07:51:54 +0000 (09:51 +0200)]
vp9: split header into separate struct and expose in vp9.h

This allows hwaccels to access the bitstream header information.

5 years agobuild/videotoolbox: add missing CoreVideo framework
Clément Bœsch [Thu, 15 Oct 2015 08:43:42 +0000 (10:43 +0200)]
build/videotoolbox: add missing CoreVideo framework

5 years agoffmpeg/videotoolbox: protect UTGetOSTypeFromString on both VDA and VT
Clément Bœsch [Thu, 15 Oct 2015 08:21:52 +0000 (10:21 +0200)]
ffmpeg/videotoolbox: protect UTGetOSTypeFromString on both VDA and VT

5 years agoffmpeg/videotoolbox: try to fix compilation when cross compiling ffmpeg with VT for...
Clément Bœsch [Thu, 15 Oct 2015 08:12:19 +0000 (10:12 +0200)]
ffmpeg/videotoolbox: try to fix compilation when cross compiling ffmpeg with VT for iOS under certain configuration

Likely a regression from 8f6f357fde0ea88db180db07a6d749ef95f52c28

5 years agodoc/ffmpeg: use stream_loop instead of loop
Ganesh Ajjanagadde [Thu, 15 Oct 2015 01:51:15 +0000 (21:51 -0400)]
doc/ffmpeg: use stream_loop instead of loop

Commit dbb03b8e47f905f0f7b10c3eb5ac11f9bfc793ff renamed loop to
stream_loop. This documents the change.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
5 years agoavfilter/af_tremolo: clean up extra newlines
Kyle Swanson [Wed, 14 Oct 2015 14:56:48 +0000 (09:56 -0500)]
avfilter/af_tremolo: clean up extra newlines

Signed-off-by: Kyle Swanson <k@ylo.ph>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agodnxhd: interleave AC levels and flags
Christophe Gisquet [Wed, 14 Oct 2015 17:20:49 +0000 (19:20 +0200)]
dnxhd: interleave AC levels and flags

This allows more efficient access to the array as the level and flags
are contiguous. Around 4% faster coefficient decoding.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agolavf: Remove duplicated latm demuxer.
Carl Eugen Hoyos [Wed, 14 Oct 2015 23:11:17 +0000 (01:11 +0200)]
lavf: Remove duplicated latm demuxer.

The demuxer used to demux loas files for which a dedicated demuxer exists.

5 years agodoc/examples/muxing: Fix mixed declaration and code
Michael Niedermayer [Wed, 14 Oct 2015 22:00:45 +0000 (00:00 +0200)]
doc/examples/muxing: Fix mixed declaration and code

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agoMerge commit 'd15368ee3926152a3a301c13cc638fbf7a062ddf'
Hendrik Leppkes [Wed, 14 Oct 2015 21:06:06 +0000 (23:06 +0200)]
Merge commit 'd15368ee3926152a3a301c13cc638fbf7a062ddf'

* commit 'd15368ee3926152a3a301c13cc638fbf7a062ddf':
  h264: Run VLC init under pthread_once

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
5 years agoMerge commit 'c53e796f8b69799b7ad6d28fbab981d37edf1bc9'
Hendrik Leppkes [Wed, 14 Oct 2015 21:02:35 +0000 (23:02 +0200)]
Merge commit 'c53e796f8b69799b7ad6d28fbab981d37edf1bc9'

* commit 'c53e796f8b69799b7ad6d28fbab981d37edf1bc9':
  thread: Provide no-op variants for pthread_once

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
5 years agoMerge commit '08377f9c3bf6dbe216512a2e05c9fac837b13fc0'
Hendrik Leppkes [Wed, 14 Oct 2015 21:02:00 +0000 (23:02 +0200)]
Merge commit '08377f9c3bf6dbe216512a2e05c9fac837b13fc0'

* commit '08377f9c3bf6dbe216512a2e05c9fac837b13fc0':
  dxva: Include last the internal header

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
5 years agoMerge commit 'c1348506697377b46f844339c178332e3314149a'
Hendrik Leppkes [Wed, 14 Oct 2015 21:01:20 +0000 (23:01 +0200)]
Merge commit 'c1348506697377b46f844339c178332e3314149a'

* commit 'c1348506697377b46f844339c178332e3314149a':
  httpauth: Add space after commas in HTTP/RTSP auth header

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
5 years agoMerge commit 'e55376a1fd5abebbb0a082aa20739d58c2260a37'
Hendrik Leppkes [Wed, 14 Oct 2015 20:55:55 +0000 (22:55 +0200)]
Merge commit 'e55376a1fd5abebbb0a082aa20739d58c2260a37'

* commit 'e55376a1fd5abebbb0a082aa20739d58c2260a37':
  rtmpproto: Write correct flv packet sizes at the end of packets

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
5 years agoffmpeg_opt: rename loop option to stream_loop
Michael Niedermayer [Wed, 14 Oct 2015 17:52:17 +0000 (19:52 +0200)]
ffmpeg_opt:  rename loop option to stream_loop

The "loop" option is used in several demuxers (like img2dec) and muxers, using the same name in ffmpeg_opt
breaks them. Feel free to revert this and replace by any other solution or rename both as preferred
This is just as a quick fix to avoid the regression with existing command lines and to have both named
the same (which does not work)

Example:
./ffmpeg -loop 1 -i fate-suite/png1/lena-rgb24.png -t 1 test.avi
will produce 25 frames with the img2dec loop but only 1 frame at 25fps with the ffmpeg loop option

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agoavformat/async: cache some data for fast seek backward
Zhang Rui [Tue, 13 Oct 2015 10:30:47 +0000 (18:30 +0800)]
avformat/async: cache some data for fast seek backward

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agoavutil/fifo: add function av_fifo_generic_peek_at()
Zhang Rui [Wed, 14 Oct 2015 06:20:07 +0000 (14:20 +0800)]
avutil/fifo: add function av_fifo_generic_peek_at()

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agoavutil/intmath: use de Bruijn based ff_ctz
Ganesh Ajjanagadde [Wed, 14 Oct 2015 14:26:59 +0000 (10:26 -0400)]
avutil/intmath: use de Bruijn based ff_ctz

It has already been demonstrated that the de Bruijn method has benefits
over the current implementation: commit 971d12b7f9d7be3ca8eb98e6c04ed521f83cbd3c.
That commit implemented it for long long, this extends it to the int version.

Tested with FATE.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
5 years agoRemove test file that accidentally ended up in one commit
Hendrik Leppkes [Wed, 14 Oct 2015 15:06:07 +0000 (17:06 +0200)]
Remove test file that accidentally ended up in one commit

5 years agolavf/vc1dec: Autodetect raw vc-1 streams.
Carl Eugen Hoyos [Wed, 14 Oct 2015 14:40:57 +0000 (16:40 +0200)]
lavf/vc1dec: Autodetect raw vc-1 streams.

Move the demuxer into its own file.

5 years agodoc/filters: fix selectivecolor example
Clément Bœsch [Wed, 14 Oct 2015 14:34:41 +0000 (16:34 +0200)]
doc/filters: fix selectivecolor example

Fixes Ticket #4927

5 years agoavfilter/formats: add av_warn_unused_result to function prototypes
Ganesh Ajjanagadde [Mon, 5 Oct 2015 13:20:33 +0000 (09:20 -0400)]
avfilter/formats: add av_warn_unused_result to function prototypes

This uses the av_warn_unused_result attribute liberally to catch some forms of improper
usage of functions defined in avfilter/formats.h.

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
5 years agoavfilter/all: propagate errors of functions from avfilter/formats
Ganesh Ajjanagadde [Mon, 5 Oct 2015 03:39:25 +0000 (23:39 -0400)]
avfilter/all: propagate errors of functions from avfilter/formats

Many of the functions from avfilter/formats can return errors, usually AVERROR(ENOMEM).
This propagates the return values.

All of these were found by using av_warn_unused_result, demonstrating its utility.

Tested with FATE. I am least sure of the changes to avfilter/filtergraph,
since I don't know what/how reduce_format is intended to behave and how it should
react to errors.

Fixes: CID 132568013256791325678.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Previous version Reviewed-by: Nicolas George <george@nsup.org>
Previous version Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
5 years agoMerge commit '6a23a34274b747280c1e4a00ad22f97f99bbb48a'
Hendrik Leppkes [Wed, 14 Oct 2015 13:01:54 +0000 (15:01 +0200)]
Merge commit '6a23a34274b747280c1e4a00ad22f97f99bbb48a'

* commit '6a23a34274b747280c1e4a00ad22f97f99bbb48a':
  mimic: drop AVPicture usage

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
5 years agoMerge commit '6fdd4c678ac1ce0776f9645cd534209e5f1ae1e3'
Hendrik Leppkes [Wed, 14 Oct 2015 13:00:53 +0000 (15:00 +0200)]
Merge commit '6fdd4c678ac1ce0776f9645cd534209e5f1ae1e3'

* commit '6fdd4c678ac1ce0776f9645cd534209e5f1ae1e3':
  libschroedinger: Properly use AVFrame API

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
5 years agoMerge commit '901f9c0a32985f48672fd68594111dc55d88a57a'
Hendrik Leppkes [Wed, 14 Oct 2015 12:56:16 +0000 (14:56 +0200)]
Merge commit '901f9c0a32985f48672fd68594111dc55d88a57a'

* commit '901f9c0a32985f48672fd68594111dc55d88a57a':
  qtrle: Properly use AVFrame API

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
5 years agoMerge commit '17e41cf3614973258c24aa2452215ef7e3bfa5ed'
Hendrik Leppkes [Wed, 14 Oct 2015 12:54:04 +0000 (14:54 +0200)]
Merge commit '17e41cf3614973258c24aa2452215ef7e3bfa5ed'

* commit '17e41cf3614973258c24aa2452215ef7e3bfa5ed':
  avcodec: Do not lock during init if there is no init function

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
5 years agoffmpeg: add deprecation guards around remaining AVFMT_RAWPICTURE usage
Hendrik Leppkes [Wed, 14 Oct 2015 12:46:40 +0000 (14:46 +0200)]
ffmpeg: add deprecation guards around remaining AVFMT_RAWPICTURE usage

5 years agoffmpeg: remove trailing whitespace that sneaked into the previous merge
Hendrik Leppkes [Wed, 14 Oct 2015 12:51:49 +0000 (14:51 +0200)]
ffmpeg: remove trailing whitespace that sneaked into the previous merge

5 years agoMerge commit '34ed5c2e4d9b7fe5c9b3aae2da5599fabb95c02e'
Hendrik Leppkes [Wed, 14 Oct 2015 12:43:20 +0000 (14:43 +0200)]
Merge commit '34ed5c2e4d9b7fe5c9b3aae2da5599fabb95c02e'

* commit '34ed5c2e4d9b7fe5c9b3aae2da5599fabb95c02e':
  avformat: Do not use AVFMT_RAWPICTURE

Removal from ffmpeg.c not merged because some parts of avdevice
still use it

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
5 years agoh264: Run VLC init under pthread_once
Derek Buitenhuis [Wed, 7 Oct 2015 16:33:01 +0000 (12:33 -0400)]
h264: Run VLC init under pthread_once

This makes the h.264 decoder threadsafe to initialize.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agothread: Provide no-op variants for pthread_once
Luca Barbato [Wed, 7 Oct 2015 20:43:38 +0000 (22:43 +0200)]
thread: Provide no-op variants for pthread_once

5 years agodxva: Include last the internal header
Luca Barbato [Tue, 13 Oct 2015 21:20:33 +0000 (23:20 +0200)]
dxva: Include last the internal header

It redefines _WIN32_WINNT, possibly causing problems with the
w32pthreads.h header.

5 years agohttpauth: Add space after commas in HTTP/RTSP auth header
Andrey Utkin [Tue, 13 Oct 2015 09:44:37 +0000 (12:44 +0300)]
httpauth: Add space after commas in HTTP/RTSP auth header

This fixes access to Grandstream cameras, which return 401 otherwise.
VLC sends Authorization: header with spaces between parameters, and it
is known to work with Grandstream devices and broad range of other HTTP
and RTSP servers, so author considers switching to such behaviour safe.

See RFC 2617 (HTTP Auth).

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agortmpproto: Write correct flv packet sizes at the end of packets
Michael Niedermayer [Tue, 13 Oct 2015 09:17:24 +0000 (12:17 +0300)]
rtmpproto: Write correct flv packet sizes at the end of packets

In one case it was written as zero, one case left it uninitialized,
missed the 11 bytes for the flv header.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoMerge commit '16b0c929621f84983b83b9735ce973acb12723bc'
Hendrik Leppkes [Wed, 14 Oct 2015 12:28:20 +0000 (14:28 +0200)]
Merge commit '16b0c929621f84983b83b9735ce973acb12723bc'

* commit '16b0c929621f84983b83b9735ce973acb12723bc':
  avconv: Add loop option.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
5 years agoMerge commit '11c5f438ff83da5040e85bfa6299f56b321d32ef'
Hendrik Leppkes [Wed, 14 Oct 2015 12:01:11 +0000 (14:01 +0200)]
Merge commit '11c5f438ff83da5040e85bfa6299f56b321d32ef'

* commit '11c5f438ff83da5040e85bfa6299f56b321d32ef':
  dict: Change return type of av_dict_copy()

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
5 years agoMerge commit 'c1aac39eaccd32dc3b74ccfcce701d3d888fbc6b'
Hendrik Leppkes [Wed, 14 Oct 2015 11:54:50 +0000 (13:54 +0200)]
Merge commit 'c1aac39eaccd32dc3b74ccfcce701d3d888fbc6b'

* commit 'c1aac39eaccd32dc3b74ccfcce701d3d888fbc6b':
  build: add Solaris symbol versioning

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
5 years agoMerge commit 'b9ece15a01782b4f301c0c139d1d7b20f848914c'
Hendrik Leppkes [Wed, 14 Oct 2015 11:48:22 +0000 (13:48 +0200)]
Merge commit 'b9ece15a01782b4f301c0c139d1d7b20f848914c'

* commit 'b9ece15a01782b4f301c0c139d1d7b20f848914c':
  nullenc: Use the wrapped avframe pseudo-encoder

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
5 years agoMerge commit 'd00a8fd417ad20cecbc7ca17b25f352655148fb1'
Hendrik Leppkes [Wed, 14 Oct 2015 11:44:33 +0000 (13:44 +0200)]
Merge commit 'd00a8fd417ad20cecbc7ca17b25f352655148fb1'

* commit 'd00a8fd417ad20cecbc7ca17b25f352655148fb1':
  yuv4mpeg: Use the wrapped avframe pseudo-encoder

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
5 years agoMerge commit '00332e0a064dad866812de9162b009cbaba6f5df'
Hendrik Leppkes [Wed, 14 Oct 2015 11:25:25 +0000 (13:25 +0200)]
Merge commit '00332e0a064dad866812de9162b009cbaba6f5df'

* commit '00332e0a064dad866812de9162b009cbaba6f5df':
  wrapped_avframe: Initial implementation

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
5 years agomimic: drop AVPicture usage
wm4 [Tue, 13 Oct 2015 12:48:55 +0000 (14:48 +0200)]
mimic: drop AVPicture usage

Work on the AVFrame references directly.

Instead of setting up a flipped/swapped "view" on the pictures,
flip/swap them when returning decoded frames to the API user.

5 years agolibschroedinger: Properly use AVFrame API
Vittorio Giovara [Mon, 12 Oct 2015 16:54:52 +0000 (18:54 +0200)]
libschroedinger: Properly use AVFrame API

Rather than copying data buffers around, allocate a proper frame, and
use the standard AVFrame functions. This effectively makes the decoder
capable of direct rendering.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agoqtrle: Properly use AVFrame API
Vittorio Giovara [Mon, 12 Oct 2015 17:00:31 +0000 (19:00 +0200)]
qtrle: Properly use AVFrame API

Rather than copying data buffers around, just add a reference to
the current frame.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agoavformat/mov: fix integer overflow
Ganesh Ajjanagadde [Sat, 10 Oct 2015 17:39:28 +0000 (13:39 -0400)]
avformat/mov: fix integer overflow

Partially fixes Ticket 4727.

-duration is not a safe expression, since duration can be INT_MIN.
One might ask how it can become INT_MIN.
Although it is true that line 2574 is no longer reached with INT_MIN due
to commit 053e80f6eaf8d87521fe58ea96886b6ee0bbe59d (which fixed another
integer overflow issue), mov_update_dts_shift is called on line 3549 as
well, right after a read of untrusted data.
One can do the fix locally there, but that function is already a huge
mess. Changing mov_update_dts_shift is likely better.

This changes duration to INT_MIN + 1 in such cases. This should not make any
practical difference since such streams are anyway fuzzer files.

Tested with FATE.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
5 years agoffserver_config: check for INT_MIN before doing FFABS
Ganesh Ajjanagadde [Fri, 9 Oct 2015 15:25:16 +0000 (11:25 -0400)]
ffserver_config: check for INT_MIN before doing FFABS

FFABS(INT_MIN) is not safe. Alternative of using FFNABS is not as
readable.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
5 years agox86/vp9itxfm: fix register clobbering in ff_vp9_idct_idct_4x4_add_12_sse2
James Almer [Tue, 13 Oct 2015 23:03:52 +0000 (20:03 -0300)]
x86/vp9itxfm: fix register clobbering in ff_vp9_idct_idct_4x4_add_12_sse2

Reviewed-by: Henrik Gramner <henrik@gramner.com>
Signed-off-by: James Almer <jamrial@gmail.com>
5 years agodnxhdenc: fix access outside of image
Christophe Gisquet [Tue, 13 Oct 2015 20:02:41 +0000 (22:02 +0200)]
dnxhdenc: fix access outside of image

This is the same test as for the 8bit case.

5 years agox86: simple_idct10_template: use const
Christophe Gisquet [Tue, 13 Oct 2015 19:21:39 +0000 (21:21 +0200)]
x86: simple_idct10_template: use const

This avoid going through constants.c while still sharing them
with proresdsp.asm

Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agoavutil/fifo: Fix thread saftey of av_fifo_generic_peek()
Michael Niedermayer [Tue, 13 Oct 2015 16:29:04 +0000 (18:29 +0200)]
avutil/fifo: Fix thread saftey of av_fifo_generic_peek()

changing the context state and restoring it is not safe if another
thread writes data into the fifo

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agoswscale: fix ticket #4881
Pedro Arthur [Tue, 13 Oct 2015 16:32:07 +0000 (13:32 -0300)]
swscale: fix ticket #4881

When scaling only a slice of a frame the output was written always
in the first lines leaving the rest of the frame black.

5 years agoavcodec/mips/aaccoder_mips: Sync with the generic code
Nedeljko Babic [Tue, 13 Oct 2015 14:14:51 +0000 (16:14 +0200)]
avcodec/mips/aaccoder_mips: Sync with the generic code

This patch fixes build of AAC encoder optimized for mips that was broken due
 to some changes in generic code that were not propagated to the optimized code.

Also, some functions in the optimized code are basically duplicate of functions
 from generic code. Since they do not bring enough improvement to the optimized
 code to justify their existence, they are removed (which improves
 maintainability of the optimized code).

Optimizations disabled in 97437bd are enabled again.

Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agovp9: use registers for constant loading where possible.
Ronald S. Bultje [Mon, 12 Oct 2015 13:54:59 +0000 (09:54 -0400)]
vp9: use registers for constant loading where possible.