Commits · bc4bdc6d61527e9e1bd2ff6d39ee68eac68ff9de · Linshizhi / ffmpeg.wasm-core

30 Jul, 2015 25 commits

Michael Niedermayer authored Jul 30, 2015

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

bc4bdc6d

Merge commit '' · d560c611

Michael Niedermayer authored Jul 30, 2015

* 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: Michael Niedermayer <michael@niedermayer.cc>

d560c611

Merge commit '' · ba12ba85

Michael Niedermayer authored Jul 30, 2015

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

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

ba12ba85

Merge commit '' · 8e675995

Michael Niedermayer authored Jul 30, 2015

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

8e675995

avcodec/y41penc: Drop coded_frame usage · 77d8fd5c
Michael Niedermayer authored Jul 30, 2015
```
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
```
77d8fd5c
avcodec/yuv4enc: drop coded_frame usage · 9ebffc5b
Michael Niedermayer authored Jul 30, 2015
```
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
```
9ebffc5b

rtsp: Only interpret $ as interleaved packet indicator at the start of replies · 764ec701

Martin Storsjö authored Jan 21, 2015

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>

764ec701

avcodec/v308enc: Remove coded_frame usage · a0123b60
Michael Niedermayer authored Jul 30, 2015
```
coded_frame is deprecated
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
```
a0123b60
avcodec/v408enc: remove coded_frame usage · 2d80de0b
Michael Niedermayer authored Jul 30, 2015
```
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
```
2d80de0b

hmac: add missing version bump and APIChanges entry · 6877537f

James Almer authored Jul 30, 2015

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

6877537f

ffmpeg: modify tty state when stderr is redirected · 92e62f49

Ganesh Ajjanagadde authored Jul 27, 2015

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

92e62f49

Merge commit '' · 1919827f

Michael Niedermayer authored Jul 30, 2015

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

1919827f

Merge commit '' · dd0dbacc

Michael Niedermayer authored Jul 30, 2015

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

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

dd0dbacc

hls: Save and forward avio options · 0c73a5a5

Luca Barbato authored Jul 23, 2015

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

Reported-by: BenWonder

0c73a5a5

http: Add the trailing endlines if they are missing · 5ae17853
Luca Barbato authored Jul 23, 2015
```
Makes slightly easier the life of those want to use the option
from the command line
```
5ae17853

checkasm: Include io.h for isatty, if available · bf0cef5c

Martin Storsjö authored Jul 29, 2015

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>

bf0cef5c

rtmpproto: free hmac context properly · 9487ffd4

James Almer authored Jul 30, 2015

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

9487ffd4

avcodec/mpegvideo_enc: Ignore QMAX if VBV constraints are exceeded · f977e69d
Michael Niedermayer authored Jul 30, 2015
```
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
```
f977e69d
avcodec/mpeg12enc: extend QP range to 28 for non linear quantizers · bf2474c7
Michael Niedermayer authored Jul 30, 2015
```
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
```
bf2474c7

libvpxenc: report pict_type/error via side-data · 9723d439

James Zern authored Jul 29, 2015

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

9723d439

libvpxenc: quiet coded_frame deprecation warnings · 88df16fe

James Zern authored Jul 29, 2015

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

88df16fe

avformat/rtmpproto: free hmac context properly · 6ce3d9fc
James Almer authored Jul 30, 2015
```
Signed-off-by: James Almer <jamrial@gmail.com>
```
6ce3d9fc
avfilter/vf_pnsr: fix author name · 222d7619
James Almer authored Jul 30, 2015
```
Signed-off-by: James Almer <jamrial@gmail.com>
```
222d7619
doc/APIchanges: fill in some missing things · 36399529
Michael Niedermayer authored Jul 30, 2015
```
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
```
36399529

avutil/hmac: fix API/ABI compatibility with the fork · bc397246

James Almer authored Jul 30, 2015

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>

bc397246

29 Jul, 2015 15 commits

Merge commit '' · 15a7a3cf

Michael Niedermayer authored Jul 29, 2015

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

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

15a7a3cf

Merge commit '' · 277a5005

Michael Niedermayer authored Jul 29, 2015

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

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

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

277a5005

avutil/hmac: support another ABI difference to the fork · 8c5cc7b7
Michael Niedermayer authored Jul 29, 2015
```
spotted this and so adding it.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
```
8c5cc7b7

Merge commit '' · 865564c4

Michael Niedermayer authored Jul 29, 2015

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

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

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

865564c4

rawdec: fix mjpeg probing buffer size check · 4c6beaed
wm4 authored Jul 29, 2015
```
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
```
4c6beaed

rawdec: fix mjpeg probing · bf51fcd3

wm4 authored Jul 29, 2015

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>

bf51fcd3

avformat/oggdec: ogg_read_seek: reset ogg after seeking · f8b81a02
Michael Niedermayer authored Jul 29, 2015
```
Fixes Ticket4743
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
```
f8b81a02
rtmpproto: use AVHMAC instead of a custom implementation · 65dd6a1f
James Almer authored Jul 29, 2015
```
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
```
65dd6a1f

fate: add test vectors for HMAC SHA and SHA-2 · e59f7cd8

James Almer authored Jul 28, 2015

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>

e59f7cd8

hmac: add support for SHA-2 · 7e38340b

James Almer authored Jul 28, 2015

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

7e38340b

avformat/rtmpproto: use AVHMAC instead of a custom implementation · 6c87b866
James Almer authored Jul 29, 2015
```
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
```
6c87b866
ffmpeg_op: Print warning if duration isnt known when -sseof is used · 0949869e
Michael Niedermayer authored Jul 29, 2015
```
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
```
0949869e
doc/ffmpeg: Use @code · 42209eb9
Michael Niedermayer authored Jul 29, 2015
```
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
```
42209eb9
avcodec/dvbsubdec: Implement display definition segment fallback from ETSI EN 300 743 V1.3.1 · 1fc20af6
Michael Niedermayer authored Jul 29, 2015
```
Fixes: subtitles.ts
Fixes: Ticket679
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
```
1fc20af6
ffmpeg: Implement support for seeking relative to EOF · f4ada6dc
Michael Niedermayer authored Jul 27, 2015
```
Fixes Ticket227
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
```
f4ada6dc