ffmpeg.git
4 years agoMerge commit '5d8bea3bb2357bb304f8f771a4107039037c5549'
Hendrik Leppkes [Sun, 2 Aug 2015 08:39:37 +0000 (10:39 +0200)]
Merge commit '5d8bea3bb2357bb304f8f771a4107039037c5549'

* commit '5d8bea3bb2357bb304f8f771a4107039037c5549':
  xtea: add av_xtea_alloc()

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'b469832de993dabbfe037bef59c68e90e82ebca5'
Hendrik Leppkes [Sun, 2 Aug 2015 08:38:53 +0000 (10:38 +0200)]
Merge commit 'b469832de993dabbfe037bef59c68e90e82ebca5'

* commit 'b469832de993dabbfe037bef59c68e90e82ebca5':
  rc4: extend av_rc4_init() doxy

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'ae365453c370c85f278bff7fbf9e20d9d335cb2a'
Hendrik Leppkes [Sun, 2 Aug 2015 08:38:33 +0000 (10:38 +0200)]
Merge commit 'ae365453c370c85f278bff7fbf9e20d9d335cb2a'

* commit 'ae365453c370c85f278bff7fbf9e20d9d335cb2a':
  rc4: add av_rc4_alloc()

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

* commit '7a7df34c91e16ea8936f59524145a2cdd6b790f9':
  blowfish: add av_blowfish_alloc()

Conflicts:
doc/APIchanges
libavutil/version.h

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'cd4d9df22738e6f147521ccb72c7930db6050914'
Hendrik Leppkes [Sun, 2 Aug 2015 08:34:18 +0000 (10:34 +0200)]
Merge commit 'cd4d9df22738e6f147521ccb72c7930db6050914'

* commit 'cd4d9df22738e6f147521ccb72c7930db6050914':
  asfdec: free AVDictionaries properly when closing the demuxer

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '90e648c508fa6b97587ce62699a1449123f7d285'
Hendrik Leppkes [Sun, 2 Aug 2015 08:32:38 +0000 (10:32 +0200)]
Merge commit '90e648c508fa6b97587ce62699a1449123f7d285'

* commit '90e648c508fa6b97587ce62699a1449123f7d285':
  fate/mp3: use the f32le format as output

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoavcodec/hevc_mp4toannexb_bsf: Remove ;;
Michael Niedermayer [Sun, 2 Aug 2015 01:52:37 +0000 (03:52 +0200)]
avcodec/hevc_mp4toannexb_bsf: Remove ;;

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/mov: fix regression in processing .aax files
Vesselin Bontchev [Fri, 31 Jul 2015 10:16:08 +0000 (12:16 +0200)]
avformat/mov: fix regression in processing .aax files

Commit 0a551cbe introduced "activation_bytes" option, and not specifying
this option (while calling ffmpeg / ffprobe) causes the program to quit
early. Before this commit, ffprobe was capable of processing metadata in
.aax files.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavfilter/avf_showvolume: stop making output fully transparent
Paul B Mahol [Sat, 1 Aug 2015 17:36:10 +0000 (19:36 +0200)]
avfilter/avf_showvolume: stop making output fully transparent

4 years agoaacenc: add description to the 'aac_coder' option
Rostislav Pehlivanov [Sat, 1 Aug 2015 16:40:30 +0000 (17:40 +0100)]
aacenc: add description to the 'aac_coder' option

This commit adds a short description to the aac_coder option of the
AAC encoder in order to be consistent with the other options.
Generally, right now, the 'FAAC' method works fine with speech and
low broadband spectrum audio. 'Fast' is just as the name suggests.
'ANMR' still needs work and 'Twoloop', the default, works well with
every type of audio.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
4 years agoRevert "libavcodec/utils: av_get_exact_bits_per_sample fixed to return "1" for DSD...
Michael Niedermayer [Sat, 1 Aug 2015 01:25:04 +0000 (03:25 +0200)]
Revert "libavcodec/utils: av_get_exact_bits_per_sample fixed to return "1" for DSD codecs."

Requested-by: Ganesh Ajjanagadde <gajjanag@mit.edu> (original patch reviewer)
This reverts commit 293e25be615d43c9b611c4b04920ec0d245a7145.

4 years agoMerge branch 'simple_http_server_api_implementation' of http://git.klaxa.eu/git/ffmpeg
Michael Niedermayer [Sat, 1 Aug 2015 01:00:01 +0000 (03:00 +0200)]
Merge branch 'simple_http_server_api_implementation' of git.klaxa.eu/git/ffmpeg

Reviewed-by: Nicolas George <george@nsup.org>
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoaacenc: remove redundant argument from coder functions
Rostislav Pehlivanov [Wed, 29 Jul 2015 04:44:24 +0000 (05:44 +0100)]
aacenc: remove redundant argument from coder functions

This commit removes a redundant argument from the functions in aaccoder.
The argument lambda was redundant as it was just a copy of s->lambda,
to which all functions have access to anyway. This cleans up the function
pointers a bit which is helpful as there are a lot of other search_for_*
functions under development and with them populated it gets messy.

Reviewed-by: Claudio Freire <klaussfreire@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/libx264: expose nv21 input support
Yu Xiaolei [Fri, 31 Jul 2015 22:42:15 +0000 (06:42 +0800)]
avcodec/libx264: expose nv21 input support

libx264 added support for NV21 input recently.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agolibavcodec/utils: av_get_exact_bits_per_sample fixed to return "1" for DSD codecs.
Ihar A. Tumashyk [Fri, 31 Jul 2015 22:52:17 +0000 (01:52 +0300)]
libavcodec/utils: av_get_exact_bits_per_sample fixed to return "1" for DSD codecs.

All DSD codes have 1 bit per sample.
https://en.wikipedia.org/wiki/Direct_Stream_Digital

Signed-off-by: Ihar A. Tumashyk <itumashyk@gmail.com>
Reviewed-by: Ganesh Ajjanagadde <gajjanag@mit.edu>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agodoc/example: Add http multi-client example code
Stephan Holljes [Sat, 25 Jul 2015 00:07:15 +0000 (02:07 +0200)]
doc/example: Add http multi-client example code

Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
4 years agodoc/protocols: document experimental mutli-client api
Stephan Holljes [Fri, 3 Jul 2015 00:38:20 +0000 (02:38 +0200)]
doc/protocols: document experimental mutli-client api

Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
4 years agolavf/http: Implement server side network code.
Stephan Holljes [Fri, 3 Jul 2015 00:28:56 +0000 (02:28 +0200)]
lavf/http: Implement server side network code.

add http_accept,
add http_handshake and move handshake logic there,
handle connection closing.

Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
4 years agolavf/tcp: increase range for listen and call the underlying socket operations accordingly
Stephan Holljes [Tue, 21 Jul 2015 04:11:10 +0000 (06:11 +0200)]
lavf/tcp: increase range for listen and call the underlying socket operations accordingly

Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
4 years agolavf/tcp: add tcp_accept
Stephan Holljes [Tue, 21 Jul 2015 04:10:25 +0000 (06:10 +0200)]
lavf/tcp: add tcp_accept

Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
4 years agolavf/avio: add avio_accept and avio_handshake
Stephan Holljes [Fri, 3 Jul 2015 00:25:51 +0000 (02:25 +0200)]
lavf/avio: add avio_accept and avio_handshake

Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
4 years agolavf/avio: add ffurl_accept and ffurl_handshake
Stephan Holljes [Fri, 3 Jul 2015 00:24:18 +0000 (02:24 +0200)]
lavf/avio: add ffurl_accept and ffurl_handshake

Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
4 years agolavf/network: split ff_listen_bind into ff_listen and ff_accept
Stephan Holljes [Fri, 3 Jul 2015 00:22:25 +0000 (02:22 +0200)]
lavf/network: split ff_listen_bind into ff_listen and ff_accept

Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
4 years agoMAINTAINERS: update my maintership
Paul B Mahol [Fri, 31 Jul 2015 18:19:06 +0000 (20:19 +0200)]
MAINTAINERS: update my maintership

4 years agodshow: show more debug timestamp info
rogerdpack [Thu, 30 Jul 2015 21:55:19 +0000 (15:55 -0600)]
dshow: show more debug timestamp info

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
4 years agoMAINTAINERS: Remove myself as leader
Michael Niedermayer [Fri, 31 Jul 2015 13:54:38 +0000 (15:54 +0200)]
MAINTAINERS: Remove myself as leader

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit 'a0797950527120c85263c910eb6ba08fddcfdcb3'
Michael Niedermayer [Fri, 31 Jul 2015 09:56:22 +0000 (11:56 +0200)]
Merge commit 'a0797950527120c85263c910eb6ba08fddcfdcb3'

* commit 'a0797950527120c85263c910eb6ba08fddcfdcb3':
  fate/mp3: specify the number of output samples instead of filesize

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoxtea: add av_xtea_alloc()
James Almer [Tue, 28 Jul 2015 19:57:48 +0000 (16:57 -0300)]
xtea: add av_xtea_alloc()

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agorc4: extend av_rc4_init() doxy
James Almer [Fri, 31 Jul 2015 07:01:06 +0000 (09:01 +0200)]
rc4: extend av_rc4_init() doxy

Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agorc4: add av_rc4_alloc()
James Almer [Tue, 28 Jul 2015 19:57:47 +0000 (16:57 -0300)]
rc4: add av_rc4_alloc()

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agoblowfish: add av_blowfish_alloc()
James Almer [Tue, 28 Jul 2015 19:57:46 +0000 (16:57 -0300)]
blowfish: add av_blowfish_alloc()

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agoasfdec: free AVDictionaries properly when closing the demuxer
Alexandra Hájková [Thu, 30 Jul 2015 17:59:25 +0000 (19:59 +0200)]
asfdec: free AVDictionaries properly when closing the demuxer

Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agofate/mp3: use the f32le format as output
Anton Khirnov [Mon, 27 Jul 2015 19:49:17 +0000 (21:49 +0200)]
fate/mp3: use the f32le format as output

Those tests test the float decoder, so it is preferable to dump the
decoder output directly instead of converting it to s16.

4 years agofate/mp3: specify the number of output samples instead of filesize
Anton Khirnov [Mon, 27 Jul 2015 19:43:22 +0000 (21:43 +0200)]
fate/mp3: specify the number of output samples instead of filesize

This is not dependent on the output format.

4 years agoavformat/wavdec: add extra sample count check for G.729 files
Ganesh Ajjanagadde [Fri, 31 Jul 2015 00:33:28 +0000 (20:33 -0400)]
avformat/wavdec: add extra sample count check for G.729 files

Can be used to fix Ticket4577

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agomips/hevcdsp: fix string concatenation on macros
James Almer [Thu, 30 Jul 2015 22:28:02 +0000 (19:28 -0300)]
mips/hevcdsp: fix string concatenation on macros

Needed for old compilers like GCC 4.2

Tested by trac user brad. Fixes ticket #4745

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agox86/aacpsdsp: add SSE and SSE3 optimized functions
James Almer [Sat, 25 Jul 2015 16:10:25 +0000 (13:10 -0300)]
x86/aacpsdsp: add SSE and SSE3 optimized functions

Between 1.5 and 2.5 times faster

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoRevert "ffmpeg: modify tty state when stderr is redirected"
Michael Niedermayer [Thu, 30 Jul 2015 20:58:35 +0000 (22:58 +0200)]
Revert "ffmpeg: modify tty state when stderr is redirected"

faults in fate otherwise breaks the terminal.
To reproduce, add a abort() into wav_read_header()
run make fate-acodec-adpcm-ima_wav

This reverts commit 92e62f49cf7440a9e8998d284528e223c0948c97.

4 years agoavcodec/r210enc: Drop coded_frame usage
Michael Niedermayer [Thu, 30 Jul 2015 17:57:58 +0000 (19:57 +0200)]
avcodec/r210enc: Drop coded_frame usage

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/avuienc: Drop coded_frame usage
Michael Niedermayer [Thu, 30 Jul 2015 17:57:07 +0000 (19:57 +0200)]
avcodec/avuienc: Drop coded_frame usage

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '764ec70149728be82304c163ccc4e280f1629201'
Michael Niedermayer [Thu, 30 Jul 2015 16:37:34 +0000 (18:37 +0200)]
Merge commit '764ec70149728be82304c163ccc4e280f1629201'

* commit '764ec70149728be82304c163ccc4e280f1629201':
  rtsp: Only interpret $ as interleaved packet indicator at the start of replies

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '6877537ff321136cf78ab03b8b91e6b6f218db5b'
Michael Niedermayer [Thu, 30 Jul 2015 16:28:43 +0000 (18:28 +0200)]
Merge commit '6877537ff321136cf78ab03b8b91e6b6f218db5b'

* commit '6877537ff321136cf78ab03b8b91e6b6f218db5b':
  hmac: add missing version bump and APIChanges entry

Conflicts:
libavutil/version.h

version.h is not changed as the code has been added 2 years ago in FFmpeg

See: 82ef67016ef731268ab7b8e91139bd5f16edc991
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '0c73a5a53cc97f4291bbe9e1e68226edf6161744'
Michael Niedermayer [Thu, 30 Jul 2015 15:42:19 +0000 (17:42 +0200)]
Merge commit '0c73a5a53cc97f4291bbe9e1e68226edf6161744'

* commit '0c73a5a53cc97f4291bbe9e1e68226edf6161744':
  hls: Save and forward avio options

Conflicts:
libavformat/hls.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '5ae178539b91d25710b7bb322d156c31aea9f8bf'
Michael Niedermayer [Thu, 30 Jul 2015 14:23:09 +0000 (16:23 +0200)]
Merge commit '5ae178539b91d25710b7bb322d156c31aea9f8bf'

* commit '5ae178539b91d25710b7bb322d156c31aea9f8bf':
  http: Add the trailing endlines if they are missing

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/y41penc: Drop coded_frame usage
Michael Niedermayer [Thu, 30 Jul 2015 14:14:23 +0000 (16:14 +0200)]
avcodec/y41penc: Drop coded_frame usage

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/yuv4enc: drop coded_frame usage
Michael Niedermayer [Thu, 30 Jul 2015 14:14:06 +0000 (16:14 +0200)]
avcodec/yuv4enc: drop coded_frame usage

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agortsp: Only interpret $ as interleaved packet indicator at the start of replies
Martin Storsjö [Wed, 21 Jan 2015 12:05:43 +0000 (13:05 +0100)]
rtsp: Only interpret $ as interleaved packet indicator at the start of replies

Allow $ as character anywhere within normal RTSP replies - both
within the lines, and as the first character of RTSP header lines.
(The existing old comment indicated that an inline packet could
start at any line within a RTSP reply header, but that doesn't
sound valid to me, and I'm not sure if the existing code
handled that correctly either.)

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoavcodec/v308enc: Remove coded_frame usage
Michael Niedermayer [Thu, 30 Jul 2015 13:54:45 +0000 (15:54 +0200)]
avcodec/v308enc: Remove coded_frame usage

coded_frame is deprecated

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/v408enc: remove coded_frame usage
Michael Niedermayer [Thu, 30 Jul 2015 13:53:54 +0000 (15:53 +0200)]
avcodec/v408enc: remove coded_frame usage

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agohmac: add missing version bump and APIChanges entry
James Almer [Thu, 30 Jul 2015 07:02:23 +0000 (04:02 -0300)]
hmac: add missing version bump and APIChanges entry

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoffmpeg: modify tty state when stderr is redirected
Ganesh Ajjanagadde [Mon, 27 Jul 2015 13:56:25 +0000 (09:56 -0400)]
ffmpeg: modify tty state when stderr is redirected

This fixes Ticket2964

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit 'bf0cef5c3a114df452e5476167634dd8f51eb448'
Michael Niedermayer [Thu, 30 Jul 2015 10:23:48 +0000 (12:23 +0200)]
Merge commit 'bf0cef5c3a114df452e5476167634dd8f51eb448'

* commit 'bf0cef5c3a114df452e5476167634dd8f51eb448':
  checkasm: Include io.h for isatty, if available

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '9487ffd4c02b9e261562d43735490068c0df0d4b'
Michael Niedermayer [Thu, 30 Jul 2015 10:14:13 +0000 (12:14 +0200)]
Merge commit '9487ffd4c02b9e261562d43735490068c0df0d4b'

* commit '9487ffd4c02b9e261562d43735490068c0df0d4b':
  rtmpproto: free hmac context properly

See: 6ce3d9fc4a70958680b93c6995cc87f34630a7e3
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agohls: Save and forward avio options
Luca Barbato [Thu, 23 Jul 2015 19:11:58 +0000 (21:11 +0200)]
hls: Save and forward avio options

Make possible to send the custom headers and override the user agent.

Reported-by: BenWonder
4 years agohttp: Add the trailing endlines if they are missing
Luca Barbato [Thu, 23 Jul 2015 19:14:09 +0000 (21:14 +0200)]
http: Add the trailing endlines if they are missing

Makes slightly easier the life of those want to use the option
from the command line

4 years agocheckasm: Include io.h for isatty, if available
Martin Storsjö [Wed, 29 Jul 2015 20:08:09 +0000 (23:08 +0300)]
checkasm: Include io.h for isatty, if available

configure does check for isatty, and checkasm properly checks
HAVE_ISATTY, but on some platforms (e.g. WinRT), io.h needs to be
included for isatty to be available.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortmpproto: free hmac context properly
James Almer [Thu, 30 Jul 2015 03:00:01 +0000 (00:00 -0300)]
rtmpproto: free hmac context properly

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoavcodec/mpegvideo_enc: Ignore QMAX if VBV constraints are exceeded
Michael Niedermayer [Thu, 30 Jul 2015 02:56:06 +0000 (04:56 +0200)]
avcodec/mpegvideo_enc: Ignore QMAX if VBV constraints are exceeded

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/mpeg12enc: extend QP range to 28 for non linear quantizers
Michael Niedermayer [Thu, 30 Jul 2015 02:42:16 +0000 (04:42 +0200)]
avcodec/mpeg12enc: extend QP range to 28 for non linear quantizers

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agolibvpxenc: report pict_type/error via side-data
James Zern [Wed, 29 Jul 2015 05:59:42 +0000 (22:59 -0700)]
libvpxenc: report pict_type/error via side-data

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Zern <jzern@google.com>
4 years agolibvpxenc: quiet coded_frame deprecation warnings
James Zern [Wed, 29 Jul 2015 05:44:54 +0000 (22:44 -0700)]
libvpxenc: quiet coded_frame deprecation warnings

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Zern <jzern@google.com>
4 years agoavformat/rtmpproto: free hmac context properly
James Almer [Thu, 30 Jul 2015 02:56:22 +0000 (23:56 -0300)]
avformat/rtmpproto: free hmac context properly

Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoavfilter/vf_pnsr: fix author name
James Almer [Thu, 30 Jul 2015 01:28:09 +0000 (22:28 -0300)]
avfilter/vf_pnsr: fix author name

Signed-off-by: James Almer <jamrial@gmail.com>
4 years agodoc/APIchanges: fill in some missing things
Michael Niedermayer [Thu, 30 Jul 2015 01:08:40 +0000 (03:08 +0200)]
doc/APIchanges: fill in some missing things

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavutil/hmac: fix API/ABI compatibility with the fork
James Almer [Thu, 30 Jul 2015 00:05:15 +0000 (21:05 -0300)]
avutil/hmac: fix API/ABI compatibility with the fork

The test code is updated with some cosmetics to avoid the loop
using undefined AVHMACType values.
The old enum values will be removed in the next major bump, effectively
making both projects synced and without API or ABI issues.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoMerge commit '65dd6a1f84cc5c9a91d279e8e8b72ff7adf58d31'
Michael Niedermayer [Wed, 29 Jul 2015 23:35:41 +0000 (01:35 +0200)]
Merge commit '65dd6a1f84cc5c9a91d279e8e8b72ff7adf58d31'

* commit '65dd6a1f84cc5c9a91d279e8e8b72ff7adf58d31':
  rtmpproto: use AVHMAC instead of a custom implementation

See: 6c87b866285fae0a45ab4d7162088428f60bd332
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit 'e59f7cd89e7f4f096f8456d63191adec2f8b1083'
Michael Niedermayer [Wed, 29 Jul 2015 23:27:36 +0000 (01:27 +0200)]
Merge commit 'e59f7cd89e7f4f096f8456d63191adec2f8b1083'

* commit 'e59f7cd89e7f4f096f8456d63191adec2f8b1083':
  fate: add test vectors for HMAC SHA and SHA-2

Conflicts:
libavutil/hmac.c
tests/ref/fate/hmac

See: 1163910a00595f01f5f6aabd5d69b01925429401
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavutil/hmac: support another ABI difference to the fork
Michael Niedermayer [Wed, 29 Jul 2015 23:03:35 +0000 (01:03 +0200)]
avutil/hmac: support another ABI difference to the fork

spotted this and so adding it.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '7e38340b831af8e3271f22bd66b9da14953c02af'
Michael Niedermayer [Wed, 29 Jul 2015 22:23:32 +0000 (00:23 +0200)]
Merge commit '7e38340b831af8e3271f22bd66b9da14953c02af'

* commit '7e38340b831af8e3271f22bd66b9da14953c02af':
  hmac: add support for SHA-2

Conflicts:
libavutil/hmac.c
libavutil/hmac.h

See: 82ef67016ef731268ab7b8e91139bd5f16edc991
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agorawdec: fix mjpeg probing buffer size check
wm4 [Wed, 29 Jul 2015 20:33:44 +0000 (22:33 +0200)]
rawdec: fix mjpeg probing buffer size check

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agorawdec: fix mjpeg probing
wm4 [Wed, 29 Jul 2015 20:11:18 +0000 (22:11 +0200)]
rawdec: fix mjpeg probing

There can be other headers than "Content-Type:" (in this case, a
"Content-Length:" header was following), so checking for a trailing
newline is wrong.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/oggdec: ogg_read_seek: reset ogg after seeking
Michael Niedermayer [Wed, 29 Jul 2015 21:17:15 +0000 (23:17 +0200)]
avformat/oggdec: ogg_read_seek: reset ogg after seeking

Fixes Ticket4743

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agortmpproto: use AVHMAC instead of a custom implementation
James Almer [Wed, 29 Jul 2015 03:23:43 +0000 (00:23 -0300)]
rtmpproto: use AVHMAC instead of a custom implementation

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agofate: add test vectors for HMAC SHA and SHA-2
James Almer [Tue, 28 Jul 2015 18:36:15 +0000 (15:36 -0300)]
fate: add test vectors for HMAC SHA and SHA-2

Also replace custom tests for MD5 with those published in RFC 2202

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agohmac: add support for SHA-2
James Almer [Tue, 28 Jul 2015 18:36:14 +0000 (15:36 -0300)]
hmac: add support for SHA-2

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoavformat/rtmpproto: use AVHMAC instead of a custom implementation
James Almer [Wed, 29 Jul 2015 02:56:42 +0000 (23:56 -0300)]
avformat/rtmpproto: use AVHMAC instead of a custom implementation

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoffmpeg_op: Print warning if duration isnt known when -sseof is used
Michael Niedermayer [Wed, 29 Jul 2015 16:58:57 +0000 (18:58 +0200)]
ffmpeg_op: Print warning if duration isnt known when -sseof is used

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agodoc/ffmpeg: Use @code
Michael Niedermayer [Wed, 29 Jul 2015 16:58:40 +0000 (18:58 +0200)]
doc/ffmpeg: Use @code

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/dvbsubdec: Implement display definition segment fallback from ETSI EN 300...
Michael Niedermayer [Wed, 29 Jul 2015 15:59:51 +0000 (17:59 +0200)]
avcodec/dvbsubdec: Implement display definition segment fallback from  ETSI EN 300 743 V1.3.1

Fixes: subtitles.ts
Fixes: Ticket679

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoffmpeg: Implement support for seeking relative to EOF
Michael Niedermayer [Mon, 27 Jul 2015 02:30:26 +0000 (04:30 +0200)]
ffmpeg: Implement support for seeking relative to EOF

Fixes Ticket227

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/aacdec_fixed: Fix preparation for resampler
Nedeljko Babic [Wed, 29 Jul 2015 14:46:18 +0000 (16:46 +0200)]
avcodec/aacdec_fixed: Fix preparation for resampler

2nd channel makes sense only for CPE type.

Skip 2nd channel in preparation for resampler (in spectral_to _sample())
depending on block type.

Fixes fate failure with clang ftrapv.

Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoffplay: Use sws_scale to scale subtitles
Michael Niedermayer [Sun, 26 Jul 2015 19:25:21 +0000 (21:25 +0200)]
ffplay: Use sws_scale to scale subtitles

Fixes some files from Ticket679

This also changes subtitles to 4:2:0 matching the output format and thus
simplifying the blend code.
This restricts placement to the chroma sample resolution though, speak up
if you consider this a problem, say so, the code could be changed to use
YUV444 for subtitles and scaling them down while blending, this would be
slower though.
The current code only uses a single swscale context and reinitializes it
as needed, this could be changed as well if needed

Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/wavdec: Check for data_size overflow
Michael Niedermayer [Wed, 29 Jul 2015 11:34:50 +0000 (13:34 +0200)]
avformat/wavdec: Check for data_size overflow

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agowavdec: make sample count check more precise
Ganesh Ajjanagadde [Wed, 29 Jul 2015 04:28:15 +0000 (00:28 -0400)]
wavdec: make sample count check more precise

May be used to fix Ticket4577

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/h264_refs: Allow slightly larger pps_ref_count[0] in PAFF RAP detection heuristic
Michael Niedermayer [Wed, 29 Jul 2015 01:03:52 +0000 (03:03 +0200)]
avcodec/h264_refs: Allow slightly larger pps_ref_count[0] in PAFF RAP detection heuristic

Fixes Ticket4738

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/h264_refs: extend RAP heuristic to multiple PPS
Michael Niedermayer [Wed, 29 Jul 2015 00:51:19 +0000 (02:51 +0200)]
avcodec/h264_refs: extend RAP heuristic to multiple PPS

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/utils: Set coded_frame.pict_type in generic code
Michael Niedermayer [Tue, 28 Jul 2015 23:20:14 +0000 (01:20 +0200)]
avcodec/utils: Set coded_frame.pict_type in generic code

This makes it possible to remove more coded_frame usage without breaking the
publically visible coded_frame

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/proresenc_anatoliy: remove coded_frame use
Michael Niedermayer [Tue, 28 Jul 2015 23:16:30 +0000 (01:16 +0200)]
avcodec/proresenc_anatoliy: remove coded_frame use

coded_frame.key_frame should be set by the core already

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/avcodec: define CODEC_FLAG based on AV_CODEC_FLAG instead of duplicating...
Michael Niedermayer [Tue, 28 Jul 2015 20:53:54 +0000 (22:53 +0200)]
avcodec/avcodec: define CODEC_FLAG based on AV_CODEC_FLAG instead of duplicating the numbers and comments

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit 'c6e0829e3696c894d24c8088c3ee30a9c17534c2'
Michael Niedermayer [Tue, 28 Jul 2015 20:30:18 +0000 (22:30 +0200)]
Merge commit 'c6e0829e3696c894d24c8088c3ee30a9c17534c2'

* commit 'c6e0829e3696c894d24c8088c3ee30a9c17534c2':
  configure: Don't force _WIN32_WINNT to an older version if targeting winphone/winrt

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit 'd75b55635a02444c2f188c26e431a1cec992babe'
Michael Niedermayer [Tue, 28 Jul 2015 20:22:06 +0000 (22:22 +0200)]
Merge commit 'd75b55635a02444c2f188c26e431a1cec992babe'

* commit 'd75b55635a02444c2f188c26e431a1cec992babe':
  dxva2/d3d11va: Set _WIN32_WINNT to 0x0602 instead of 0x0600

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agolibavcodec/qsvdec.c delay in 1 microsecond replaced to more appropriate 500 microseconds
Ivan Uskov [Fri, 24 Jul 2015 11:45:38 +0000 (07:45 -0400)]
libavcodec/qsvdec.c delay in 1 microsecond replaced to more appropriate 500 microseconds

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agolibavcodec/qsvenc.c delay in 1 microsecond replaced to more appropriate 500 microseconds
Ivan Uskov [Tue, 28 Jul 2015 15:30:56 +0000 (18:30 +0300)]
libavcodec/qsvenc.c delay in 1 microsecond replaced to more appropriate 500 microseconds

This commit replaces the 1 microsecond delay by 500 microsecond for the
case when the MFX library does return MFX_WRN_DEVICE_BUSY status.
In general this warning never appears for simple encoding or
transcoding session because the GPU is so fast so it almost always is not busy and
any delay value just does not executes.
But for heavy transcoding tasks for example, when several QSV sessions
are running simultaneously then using a 1-microsecond delay may
result in 1000 iterations per each frame.
So here possible a paradoxical case when GPU loading also loads CPU by dummy tasks.
Official MFX/QSV samples by Intel are using 1 millisecond (i.e. 1000
microseconds) everywhere where MFX_WRN_DEVICE_BUSY does appear.
So 500us is a much more optimal value than 1us.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/aac_fixed: Fix a bug in spectral_to_sample()
Nedeljko Babic [Tue, 28 Jul 2015 15:40:23 +0000 (17:40 +0200)]
avcodec/aac_fixed: Fix a bug in spectral_to_sample()

There was fixed number of loops (2048) in preparation for resampler, so
when number of samples is smaller than this, there would be an overflow on
ret_buf.

For some reason this behavior popped out only under valgrind with
--disable-memory-poisoning option.

This is now fixed and number of loops depends on actual number of samples.

Signed-off-by: Nedeljko Babic <nedeljko.babic@rt-rk.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoffmpeg.c: remove all remaining coded_frame uses
Michael Niedermayer [Tue, 28 Jul 2015 17:42:00 +0000 (19:42 +0200)]
ffmpeg.c: remove all remaining coded_frame uses

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoconfigure: Don't force _WIN32_WINNT to an older version if targeting winphone/winrt
Martin Storsjö [Fri, 24 Jul 2015 20:12:43 +0000 (23:12 +0300)]
configure: Don't force _WIN32_WINNT to an older version if targeting winphone/winrt

This avoids having to manually set _WIN32_WINNT in --extra-cflags
when targeting these API families, which only was necessary to
work around configure setting _WIN32_WINNT to an older version
by default.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agodxva2/d3d11va: Set _WIN32_WINNT to 0x0602 instead of 0x0600
Martin Storsjö [Sat, 25 Jul 2015 17:30:31 +0000 (20:30 +0300)]
dxva2/d3d11va: Set _WIN32_WINNT to 0x0602 instead of 0x0600

If _WIN32_WINNT is unset, we force it to a new enough value to
make sure the necessary definitions are visible.

When targeting Windows Phone or Windows RT, _WIN32_WINNT should
be at least 0x0602 - otherwise the windows headers themselves
can cause errors (which technically are bugs in the headers).

Raising this value here shouldn't hurt; the alternative would
be to not touch it at all if WINAPI_FAMILY is set to phone/app,
or to force setting it to 0x0602 in configure if unset (for phone/app).

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agolibavcodec/hevc_mp4toannexb_bsf.c: Optional argument "private_spspps_buf" to avoid...
Ivan Uskov [Tue, 28 Jul 2015 13:33:43 +0000 (09:33 -0400)]
libavcodec/hevc_mp4toannexb_bsf.c: Optional argument "private_spspps_buf" to avoid extradata modification.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/libdcadec: exss is used only under ifdef, thus mark it as potentially unused
Michael Niedermayer [Tue, 28 Jul 2015 11:35:47 +0000 (13:35 +0200)]
avcodec/libdcadec: exss is used only under ifdef, thus mark it as potentially unused

avoids a compiler warning

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/h264_slice: Also check sei_recovery_frame_cnt for skip_frame nokey
Michael Niedermayer [Tue, 28 Jul 2015 11:27:16 +0000 (13:27 +0200)]
avcodec/h264_slice: Also check sei_recovery_frame_cnt for skip_frame nokey

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>