Commits · ae48547a5296f7aa5518d934325aeaddbdad2cd5 · Linshizhi / ffmpeg.wasm-core

02 Aug, 2013 7 commits

Michael Niedermayer authored Aug 02, 2013

* commit 'e4529df9':
  flvdec: K&R formatting cosmetics

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

ae48547a

Merge commit '' · cb73f840

Michael Niedermayer authored Aug 02, 2013

* commit '390b4d70':
  flvdec: Fix = vs. == typo in sample rate check
Merged-by: Michael Niedermayer <michaelni@gmx.at>

cb73f840

Merge commit '' · ca1b0291

Michael Niedermayer authored Aug 02, 2013

* commit 'fd8f91e3':
  rtsp: Simplify code for forming the remote peer url
Merged-by: Michael Niedermayer <michaelni@gmx.at>

ca1b0291

jpeg2000dec: simplify jpeg2000_read_bitstream_packets() · bff371e3

Michael Niedermayer authored Jul 23, 2013

23 lines less
less error prone as theres no more need to update *_size on every read
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

bff371e3

avcodec/wmaenc: change commented assert to av_assert · 5936d982
Michael Niedermayer authored Aug 02, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
5936d982

mpegts: save last pcr of pcr pids in PES Context · d75d9112

Marton Balint authored Jul 27, 2013

Based on a patch by Reimar Döffinger.
http://lists.ffmpeg.org/pipermail/ffmpeg-devel/2012-September/131610.htmlSigned-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

d75d9112

libxvid: cosmetics: Realign the code · b3f858b8
Timothy Gu authored Jul 31, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
b3f858b8

01 Aug, 2013 25 commits

ffmpeg: raise level for message printed in case of auto-select pixel format · f118b417

Stefano Sabatini authored Aug 01, 2013

Increase visibility, in order to decrease troubleshooting for
users generating non playable H.264 content.
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>

f118b417

lavf/movenc: Write disc number and total number of discs as part of metadata. · fbc0004b
Carl Eugen Hoyos authored Aug 01, 2013
```
Fixes ticket #2731.
```
fbc0004b
lavf/movenc: Write total number of tracks as part of metadata. · bb7f71d9
Carl Eugen Hoyos authored Aug 01, 2013
```
Fixes ticket #2157.
```
bb7f71d9

Merge remote-tracking branch 'qatar/master' · 9408d990

Michael Niedermayer authored Aug 01, 2013

* qatar/master:
  avframe: have av_frame_get_side_data take const AVFrame*
Merged-by: Michael Niedermayer <michaelni@gmx.at>

9408d990

Merge commit '' · 0f5a40c2

Michael Niedermayer authored Aug 01, 2013

* commit 'ee37d581':
  rtpproto: Allow specifying a separate rtcp port in ff_rtp_set_remote_url
Merged-by: Michael Niedermayer <michaelni@gmx.at>

0f5a40c2

Merge commit '' · 2ee58af5

Michael Niedermayer authored Aug 01, 2013

* commit '1851e1d0':
  rtpproto: Check the size before reading buf[1]
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2ee58af5

Merge commit '' · 4f07fcd3

Michael Niedermayer authored Aug 01, 2013

* commit '7748dd41':
  avconv: add -n option to immediately exit when output files already exist

Conflicts:
	Changelog
	doc/ffmpeg.texi
	ffmpeg_opt.c

See: 0a4f0211Merged-by: Michael Niedermayer <michaelni@gmx.at>

4f07fcd3

Merge commit '' · 56e68237

Michael Niedermayer authored Aug 01, 2013

* commit 'b85dbe68':
  avconv: Call exit_program instead of exit in avconv_opt as well

Conflicts:
	ffmpeg_opt.c

See: eeddeb65Merged-by: Michael Niedermayer <michaelni@gmx.at>

56e68237

flvdec: K&R formatting cosmetics · e4529df9
Diego Biurrun authored Jul 31, 2013

e4529df9
flvdec: Fix = vs. == typo in sample rate check · 390b4d70
Diego Biurrun authored Jul 31, 2013

390b4d70

Merge commit '' · cca229e7

Michael Niedermayer authored Aug 01, 2013

* commit 'c7e921a5':
  avopt: Check whether the object actually has got an AVClass

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

cca229e7

Merge commit '' · fcccb4c1

Michael Niedermayer authored Aug 01, 2013

* commit 'b7e6da98':
  rtpproto: Move rtpproto specific function declarations to a separate header
Merged-by: Michael Niedermayer <michaelni@gmx.at>

fcccb4c1

Merge commit '' · d6b37de4

Michael Niedermayer authored Aug 01, 2013

* commit '892b0be1':
  rtpproto: Simplify the rtp_read function by looping over the fds
Merged-by: Michael Niedermayer <michaelni@gmx.at>

d6b37de4

Merge commit '' · b39f012d

Michael Niedermayer authored Aug 01, 2013

* commit '7531588f':
  rtpproto: Remove a misplaced comment
Merged-by: Michael Niedermayer <michaelni@gmx.at>

b39f012d

Merge commit '' · d2c613dd

Michael Niedermayer authored Aug 01, 2013

* commit '54e03ff6':
  rtpproto: Support nonblocking reads
Merged-by: Michael Niedermayer <michaelni@gmx.at>

d2c613dd

Merge commit '' · 57b8ce41

Michael Niedermayer authored Aug 01, 2013

* commit '2e814d03':
  rtpenc: Simplify code by introducing a macro for rescaling NTP timestamps
Merged-by: Michael Niedermayer <michaelni@gmx.at>

57b8ce41

Merge commit '' · 0c8efe48

Michael Niedermayer authored Aug 01, 2013

* commit '45dd1ae1':
  avfilter: Add some missing FF_API_AVFILTERBUFFER ifdefs

Conflicts:
	libavfilter/buffer.c
	libavfilter/internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

0c8efe48

avutil/tree: fix memleaks · b3264381
Michael Niedermayer authored Aug 01, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
b3264381

Merge commit '' · 161054f3

Michael Niedermayer authored Aug 01, 2013

* commit 'c2e936de':
  tree-test: Refactor and plug memory leaks

Conflicts:
	libavutil/tree.c

Most of this commit is not merged due to bugs in it
Merged-by: Michael Niedermayer <michaelni@gmx.at>

161054f3

rtsp: Simplify code for forming the remote peer url · fd8f91e3
Martin Storsjö authored Aug 01, 2013
```
Signed-off-by: Martin Storsjö <martin@martin.st>
```
fd8f91e3

Merge commit '' · bc47d126

Michael Niedermayer authored Aug 01, 2013

* commit 'a9b04b2c':
  tree.h: K&R formatting and typo cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>

bc47d126

avframe: have av_frame_get_side_data take const AVFrame* · 3c8bff07
Vittorio Giovara authored Jul 30, 2013
```
Signed-off-by: Anton Khirnov <anton@khirnov.net>
```
3c8bff07

rtpproto: Allow specifying a separate rtcp port in ff_rtp_set_remote_url · ee37d581

Martin Storsjö authored Jul 31, 2013

A separate rtcp port can already be set when opening the rtp
protocol normally, but when doing port setup as in RTSP (where
we first need to open the local ports and pass them to the peer,
and only then receive the remote peer port numbers), we didn't
check the same url parameter as in the normal open routine.
Signed-off-by: Martin Storsjö <martin@martin.st>

ee37d581

rtpproto: Check the size before reading buf[1] · 1851e1d0

Martin Storsjö authored Jul 31, 2013

I doubt that anyone ever would try to send a 1 byte packet
via the RTP protocol, but check just in case - it shouldn't
crash at least.
Signed-off-by: Martin Storsjö <martin@martin.st>

1851e1d0

doc/protocols: Document file protocol options · 11ace706

Andrey Utkin authored Jul 14, 2013

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

11ace706

31 Jul, 2013 8 commits
- lclenc: remove unused code · 69fe25cd
  Paul B Mahol authored Jul 26, 2013
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
  69fe25cd
- sunrastenc: do not set avctx->coded_frame · fe375512
  Paul B Mahol authored Jul 26, 2013
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
  fe375512
- jv: make code independent of sizeof(AVFrame) · 678431d3
  Paul B Mahol authored Jul 31, 2013
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
  678431d3
- mss3: make code independent of sizeof(AVFrame) · ff1c13b1
  Paul B Mahol authored Jul 29, 2013
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
  ff1c13b1
- mss2: make code independent of sizeof(AVFrame) · 02fe531a
  Paul B Mahol authored Jul 29, 2013
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
  02fe531a
- indeo2: make code independent of sizeof(AVFrame) · 451b2ca1
  Paul B Mahol authored Jul 26, 2013
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
  451b2ca1
- smacker: make code independent of sizeof(AVFrame) · 76e27b1d
  Paul B Mahol authored Jul 26, 2013
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
  76e27b1d
- avconv: add -n option to immediately exit when output files already exist · 7748dd41
  Vittorio Giovara authored Jul 31, 2013
```
Signed-off-by: Martin Storsjö <martin@martin.st>
```
  7748dd41