Signed-off-by: Nrogerdpack <rogerpack2005@gmail.com>

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

* commit 'a0797950':
  fate/mp3: specify the number of output samples instead of filesize
Merged-by: NMichael Niedermayer <michael@niedermayer.cc>

This is not dependent on the output format.

Can be used to fix Ticket4577
Signed-off-by: NGanesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: NMichael Niedermayer <michael@niedermayer.cc>

Needed for old compilers like GCC 4.2

Tested by trac user brad. Fixes ticket #4745
Reviewed-by: NMichael Niedermayer <michael@niedermayer.cc>
Signed-off-by: NJames Almer <jamrial@gmail.com>

Between 1.5 and 2.5 times faster
Reviewed-by: NMichael Niedermayer <michael@niedermayer.cc>
Signed-off-by: NJames Almer <jamrial@gmail.com>

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 92e62f49.

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

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

* commit '764ec701':
  rtsp: Only interpret $ as interleaved packet indicator at the start of replies
Merged-by: NMichael Niedermayer <michael@niedermayer.cc>

* commit '6877537f':
  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: 82ef6701Merged-by: NMichael Niedermayer <michael@niedermayer.cc>

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

Conflicts:
	libavformat/hls.c
Merged-by: NMichael Niedermayer <michael@niedermayer.cc>

* commit '5ae17853':
  http: Add the trailing endlines if they are missing
Merged-by: NMichael Niedermayer <michael@niedermayer.cc>

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

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

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: NMartin Storsjö <martin@martin.st>

coded_frame is deprecated
Signed-off-by: NMichael Niedermayer <michael@niedermayer.cc>

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

Signed-off-by: NJames Almer <jamrial@gmail.com>
Signed-off-by: NMartin Storsjö <martin@martin.st>

This fixes Ticket2964
Signed-off-by: NGanesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: NMichael Niedermayer <michael@niedermayer.cc>

* commit 'bf0cef5c':
  checkasm: Include io.h for isatty, if available
Merged-by: NMichael Niedermayer <michael@niedermayer.cc>

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

See: 6ce3d9fcMerged-by: NMichael Niedermayer <michael@niedermayer.cc>

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

Reported-by: BenWonder

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

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: NMartin Storsjö <martin@martin.st>

Signed-off-by: NJames Almer <jamrial@gmail.com>
Signed-off-by: NMartin Storsjö <martin@martin.st>

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

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

Reviewed-by: NMichael Niedermayer <michael@niedermayer.cc>
Signed-off-by: NJames Zern <jzern@google.com>

Reviewed-by: NMichael Niedermayer <michael@niedermayer.cc>
Signed-off-by: NJames Zern <jzern@google.com>

Signed-off-by: NJames Almer <jamrial@gmail.com>

Signed-off-by: NJames Almer <jamrial@gmail.com>

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

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: NMichael Niedermayer <michael@niedermayer.cc>
Signed-off-by: NJames Almer <jamrial@gmail.com>

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

See: 6c87b866Merged-by: NMichael Niedermayer <michael@niedermayer.cc>

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

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

See: 1163910aMerged-by: NMichael Niedermayer <michael@niedermayer.cc>

spotted this and so adding it.
Signed-off-by: NMichael Niedermayer <michael@niedermayer.cc>

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

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

See: 82ef6701Merged-by: NMichael Niedermayer <michael@niedermayer.cc>