Commits · 15c92f8c486a91ca2bd8607a088bee2219c34452 · Linshizhi / ffmpeg.wasm-core

11 Aug, 2013 14 commits

Merge remote-tracking branch 'qatar/master' · 15c92f8c
Michael Niedermayer authored Aug 11, 2013
```
* qatar/master:
  rtmp: Do not misuse memcmp
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
15c92f8c

Michael Niedermayer authored Aug 11, 2013

* commit '205a4502':
  doc: Clarify the avconv section about -re

Conflicts:
	doc/ffmpeg.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>

99091ff2

Merge commit '' · 5993b962

Michael Niedermayer authored Aug 11, 2013

* commit 'd175a573':
  doc: Add an example on publishing over RTMP
  doc: Add librtmp to the section header for the librtmp specific details
Merged-by: Michael Niedermayer <michaelni@gmx.at>

5993b962

Merge commit '' · 159dfd26

Michael Niedermayer authored Aug 11, 2013

* commit 'a435ca5b':
  doc: Explain that the default RTMP user agent is different when publishing
Merged-by: Michael Niedermayer <michaelni@gmx.at>

159dfd26

Merge commit '' · 78242e43

Michael Niedermayer authored Aug 11, 2013

* commit 'aa16a6b0':
  doc: Extend the rtmp example to include how to pass username/password
Merged-by: Michael Niedermayer <michaelni@gmx.at>

78242e43

Merge commit '' · 6c7a0535

Michael Niedermayer authored Aug 11, 2013

* commit '8e1fe345':
  rtmp: Detect and warn if the user tries to pass librtmp style parameters
Merged-by: Michael Niedermayer <michaelni@gmx.at>

6c7a0535

Merge commit '' · 06186a31

Michael Niedermayer authored Aug 11, 2013

* commit 'ba5393a6':
  rtmp: rename data_size to size
Merged-by: Michael Niedermayer <michaelni@gmx.at>

06186a31

Merge commit '' · a2b0699f

Michael Niedermayer authored Aug 11, 2013

* commit '4ebc7d65':
  rtmp: Use PRId64 when needed.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

a2b0699f

avcodec/avpacket: Fix memory allocation failure check · b905a713
Michael Niedermayer authored Aug 11, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
b905a713

Merge commit '' · 67a580f4

Michael Niedermayer authored Aug 11, 2013

* commit '5a9a9d4a':
  lavc: Add refcounted api to AVPacket

Conflicts:
	libavcodec/avpacket.c
	libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

67a580f4

Merge commit '' · 921c1d4c

Michael Niedermayer authored Aug 11, 2013

* commit 'c1076d84':
  h264: check one context_init() allocation

Conflicts:
	libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

921c1d4c

Merge commit '' · d2d8e259

Michael Niedermayer authored Aug 11, 2013

* commit '5eb488bf':
  h264: use explicit variable names for *_field_flag

Conflicts:
	libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

d2d8e259

svq3: Fix ff_h264_check_intra_pred_mode() return code check · 019eb2c7
Michael Niedermayer authored Aug 11, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
019eb2c7

Merge commit '' · e0b45ca7

Michael Niedermayer authored Aug 11, 2013

* commit 'b3dc260e':
  h264: return meaningful values

Conflicts:
	libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

e0b45ca7

10 Aug, 2013 26 commits
- rtmp: Do not misuse memcmp · 5718e348
  Luca Barbato authored Aug 08, 2013
```
CC: libav-stable@libav.org
```
  5718e348
- lavu: fix grammar in doxy for av_frame_ref. · 4dcb2f74
  Thilo Borgmann authored Aug 10, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  4dcb2f74
- lavd: Fix make checkheaders · 214293b1
  James Almer authored Aug 10, 2013
```
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  214293b1
- bprint: Include va_copy compat · d9c1fb83
  Derek Buitenhuis authored Aug 10, 2013
```
Fixes build with MSVC and ICL.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
```
  d9c1fb83
- tests/fli: avoid rounding errors in -t option. · d5f38847
  Nicolas George authored Aug 10, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  d5f38847
- avutil/opt: make const tables static const · 5fc5170c
  Michael Niedermayer authored Aug 10, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  5fc5170c
- avutil/opt: fix av_log type · 18b1381c
  Michael Niedermayer authored Aug 10, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  18b1381c
- avformat/tedcaptionsdec: make const arrays static const · db4918b7
  Michael Niedermayer authored Aug 10, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  db4918b7
- avfilter/f_sendcmd: make const arrays static const · 0b562718
  Michael Niedermayer authored Aug 10, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  0b562718
- avutil/log: Use bprint for part · 148310ca
  Michael Niedermayer authored Aug 10, 2013
```
This should fix the issue with strings longer than 1024
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  148310ca
- doc: Clarify the avconv section about -re · 205a4502
  Martin Storsjö authored Aug 10, 2013
```
Signed-off-by: Martin Storsjö <martin@martin.st>
```
  205a4502
- doc: Add an example on publishing over RTMP · d175a573
  Martin Storsjö authored Aug 10, 2013
```
Signed-off-by: Martin Storsjö <martin@martin.st>
```
  d175a573
- doc: Explain that the default RTMP user agent is different when publishing · a435ca5b
  Martin Storsjö authored Aug 10, 2013
```
The fact that a different user agent is used is cruicial for getting
publishing authentication working. (When using librtmp, this other
user agent has to be specified manually, but that's not needed
with the libavformat internal RTMP support.)
Signed-off-by: Martin Storsjö <martin@martin.st>
```
  a435ca5b
- doc: Extend the rtmp example to include how to pass username/password · aa16a6b0
  Martin Storsjö authored Aug 10, 2013
```
Signed-off-by: Martin Storsjö <martin@martin.st>
```
  aa16a6b0
- doc: Add librtmp to the section header for the librtmp specific details · 3bea53db
  Martin Storsjö authored Aug 10, 2013
```
Signed-off-by: Martin Storsjö <martin@martin.st>
```
  3bea53db
- rtmp: Detect and warn if the user tries to pass librtmp style parameters · 8e1fe345
  Martin Storsjö authored Aug 10, 2013
```
Signed-off-by: Martin Storsjö <martin@martin.st>
```
  8e1fe345
- avutil/bprint: add av_vbprintf() · 112c970c
  Michael Niedermayer authored Aug 10, 2013
```
Reviewed-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  112c970c
- rtmp: rename data_size to size · ba5393a6
  Luca Barbato authored Aug 08, 2013
  
  ba5393a6
- rtmp: Use PRId64 when needed. · 4ebc7d65
  Luca Barbato authored Aug 08, 2013
  
  4ebc7d65
- lavc: Add refcounted api to AVPacket · 5a9a9d4a
  Luca Barbato authored Jul 10, 2013
```
Provide a clean way to manipulate packets.
```
  5a9a9d4a
- h264: check one context_init() allocation · c1076d84
  Vittorio Giovara authored Aug 02, 2013
```
Signed-off-by: Anton Khirnov <anton@khirnov.net>
```
  c1076d84
- h264: use explicit variable names for *_field_flag · 5eb488bf
  Vittorio Giovara authored Aug 02, 2013
```
Signed-off-by: Anton Khirnov <anton@khirnov.net>
```
  5eb488bf
- h264: return meaningful values · b3dc260e
  Vittorio Giovara authored Aug 02, 2013
```
Signed-off-by: Anton Khirnov <anton@khirnov.net>
```
  b3dc260e
- Merge remote-tracking branch 'qatar/master' · b37ff488
  Michael Niedermayer authored Aug 10, 2013
```
* qatar/master:
  libavutil: Make avpriv_open a library-internal function on msvcrt
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  b37ff488
- Merge commit 'a76d0cdf' · ef13a005
  Michael Niedermayer authored Aug 10, 2013
```
* commit 'a76d0cdf':
  libavutil: Move avpriv_open to a new file, file_open.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  ef13a005
- Merge commit 'cb0244da' · e3a296df
  Michael Niedermayer authored Aug 10, 2013
```
* commit 'cb0244da':
  bktr: Changed a missed occurrance of open into avpriv_open
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  e3a296df