Commits · 547042a8cd0f425263a4f96603debe8b4fab1b93 · Linshizhi / ffmpeg.wasm-core

02 Mar, 2013 8 commits

Merge remote-tracking branch 'qatar/master' · 547042a8

Michael Niedermayer authored Mar 02, 2013

* qatar/master:
  h264: set ref_count to 0 for intra slices.

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

547042a8

Merge commit '' · 2d2e6db7

Michael Niedermayer authored Mar 02, 2013

* commit '668e16a0':
  h264: on reference overflow, reset the reference count to 0, not 1.

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

2d2e6db7

Merge commit '' · ec203cd6

Michael Niedermayer authored Mar 02, 2013

* commit 'e671d3ad':
  h264: do not copy ref count/ref2frm when updating per-frame context
  flvdec: Check the return value of a malloc

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

ec203cd6

Merge commit '' · 973dc110

Michael Niedermayer authored Mar 02, 2013

* commit 'c91c63b5':
  flvdec: Don't read the VP6 header byte when setting codec type based on metadata

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

973dc110

h264: set ref_count to 0 for intra slices. · 437211ae
Anton Khirnov authored Feb 14, 2013
```
CC:libav-stable@libav.org
```
437211ae

h264: on reference overflow, reset the reference count to 0, not 1. · 668e16a0

Anton Khirnov authored Feb 14, 2013

Since decode_slice_header() returns before the reference lists are
constructed, there are zero valid references.

CC:libav-stable@libav.org

668e16a0

h264: do not copy ref count/ref2frm when updating per-frame context · e671d3ad
Anton Khirnov authored Feb 14, 2013
```
They are filled in decode_slice_header() anyway.
```
e671d3ad
v4l2: fix regression that caused ffmpeg to occasionally get stuck · 38277345
Michael Niedermayer authored Mar 02, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
38277345

01 Mar, 2013 29 commits

lavd/v4l2: copy frames into normally allocated packets whenever there is just... · 0d66268e

Giorgio Vazzana authored Feb 14, 2013

lavd/v4l2: copy frames into normally allocated packets whenever there is just one buffer left available

This will avoid the possibility that we dequeue more buffers than we
have obtained from the v4l2 driver.

Fixes ticket #1570
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

0d66268e

flvdec: Check the return value of a malloc · c5a738ca

Martin Storsjö authored Mar 01, 2013

The callers of this function can't report errors sanely. If this
one malloc fails, don't write the extradata byte, make sure we
try to malloc it the next time we're called instead, and make sure
we still consume the input data byte.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>

c5a738ca

flvdec: Don't read the VP6 header byte when setting codec type based on metadata · c91c63b5

Martin Storsjö authored Mar 01, 2013

This header byte is only present when actually reading a VP6 frame,
not when reading the codec type field in the metadata. This
potential bug has been present since 5b54a90c.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>

c91c63b5

ffplay: use AVFrame accessor functions · ec1d2e2f
Michael Niedermayer authored Mar 01, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
ec1d2e2f
avcodec/utils: use AVFrame accessor functions · cc38ca67
Michael Niedermayer authored Mar 01, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
cc38ca67
avcodec/rawdec: use AVFrame accessor functions · 30806ddc
Michael Niedermayer authored Mar 01, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
30806ddc
pngdec: use AVFrame accessor functions · f59ff8fa
Michael Niedermayer authored Mar 01, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
f59ff8fa
gifdec: use AVFrame accessor functions · ff080346
Michael Niedermayer authored Mar 01, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
ff080346
cpia: use AVFrame accessor functions · 7d7fb701
Michael Niedermayer authored Mar 01, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
7d7fb701
tiff: use AVFrame accessor functions · f2326591
Michael Niedermayer authored Mar 01, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
f2326591
ac3dec: use AVFrame accessor functions · e0f716a9
Michael Niedermayer authored Mar 01, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
e0f716a9
ffprobe: use AVFrame accessor functions · 3ded235f
Michael Niedermayer authored Mar 01, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
3ded235f
doc/examples/demuxing: use AVFrame accessor functions · 5ade6bfb
Michael Niedermayer authored Mar 01, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
5ade6bfb
avcodec: add ff_frame_get_metadatap() · bf90ef03
Michael Niedermayer authored Mar 01, 2013
```
This is needed for av_dict_*
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
bf90ef03
lavc/codec_desc: add/fix .props for SGI/DPX/X-face/BRender PIX image · 5b802cf5
Paul B Mahol authored Mar 01, 2013
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
5b802cf5
Handle an invalid extra mpeg2 picture header following a frame-encoded picture. · 4a6bd346
Joseph Artsimovich authored Mar 01, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
4a6bd346
sgidec: use unchecked bytestream2 functions where it makes sense · 6c7d1608
Paul B Mahol authored Mar 01, 2013
```
Overreads can not happen as header size of 512 bytes is required.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
6c7d1608

soxr: libsoxr 0.1.1 support · dc666d36

Rob Sykes authored Mar 01, 2013

Libsoxr 0.1.1 will be out very soon; no changes planned beyond what's currently in git.
It includes a couple of fixes (not affecting FFmpeg's current usage) and a minor API change (but remains ABI compatible).
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

dc666d36

exr: use bytestream functions in pxr24_uncompress() · 5a232e50
Paul B Mahol authored Mar 01, 2013
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
5a232e50

Merge remote-tracking branch 'qatar/master' · 4b335e73

Michael Niedermayer authored Mar 01, 2013

* qatar/master:
  lls: Do not return from void functions
Merged-by: Michael Niedermayer <michaelni@gmx.at>

4b335e73

Merge commit '' · 7da1b235

Michael Niedermayer authored Mar 01, 2013

* commit '4da950c0':
  lls: #ifndef --> #if in FF_API_ version guard
Merged-by: Michael Niedermayer <michaelni@gmx.at>

7da1b235

Merge commit '' · 1a7166a5

Michael Niedermayer authored Mar 01, 2013

* commit 'e8c52271':
  Revert "Move H264/QPEL specific asm from dsputil.asm to h264_qpel_*.asm."

Conflicts:
	libavcodec/x86/dsputil.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>

1a7166a5

Merge commit '' · 28bb17ca

Michael Niedermayer authored Mar 01, 2013

* commit '399663be':
  lls: mark max_order as unsigned short
Merged-by: Michael Niedermayer <michaelni@gmx.at>

28bb17ca

Merge commit '' · 76f8d3c8

Michael Niedermayer authored Mar 01, 2013

* commit '9d4da474':
  lls: move to the private namespace

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

76f8d3c8

Merge commit '' · fb4b1607

Michael Niedermayer authored Mar 01, 2013

* commit '7ac6d242':
  lls: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>

fb4b1607

Merge commit '' · 41401773

Michael Niedermayer authored Mar 01, 2013

* commit 'df0229a7':
  avconv: Apply codec options to streams that are copied as well
Merged-by: Michael Niedermayer <michaelni@gmx.at>

41401773

Merge commit '' · 46f4b468

Michael Niedermayer authored Mar 01, 2013

* commit 'cb6f8245':
  cmdutils: Allow calling filter_codec_opts without a set encoder
  pnm: Use av_pix_fmt_desc_get instead of accessing the array directly
Merged-by: Michael Niedermayer <michaelni@gmx.at>

46f4b468

lls: Do not return from void functions · 0b311293
Diego Biurrun authored Feb 28, 2013

0b311293
lls: #ifndef --> #if in FF_API_ version guard · 4da950c0
Diego Biurrun authored Feb 28, 2013

4da950c0

28 Feb, 2013 3 commits
- ffmpeg: fix variable name in psnr printing code · e20f2dc0
  Michael Niedermayer authored Feb 28, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  e20f2dc0
- libvpxenc: dont redundantly zero fields, the whole context is zeroed on init · 1d178710
  Michael Niedermayer authored Feb 28, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  1d178710
- libvpxenc: add psnr support · 3c3a8c14
  Pascal Massimino authored Feb 28, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  3c3a8c14