Commits · 3dc494f8b94bc89884ce8aee96b485b963094aa6 · Linshizhi / ffmpeg.wasm-core

19 Jan, 2014 5 commits
- lavfi/vidstabtransform: apply various documentation/option minor fixes · 3dc494f8
  Stefano Sabatini authored Jan 16, 2014
```
Improve consistency with the rest of the documentation.
```
  3dc494f8
- avcodec/aacdec: Dont fail if channels arent known yet · 676a395a
  Michael Niedermayer authored Jan 19, 2014
```
Fixes Ticket3312
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  676a395a
- avcodec/mjpegdec: Dont treat the lack of a startcode differently from end of the bitstream · 31e703e8
  Michael Niedermayer authored Jan 19, 2014
```
Fixes Ticket3303
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  31e703e8
- avcodec/mjpegdec: only run EOI emulation code when there was a scan · 361e27a3
  Michael Niedermayer authored Jan 19, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  361e27a3
- avcodec/mjpegdec: update cur_scan also for non-LS jpeg · 8893f31e
  Michael Niedermayer authored Jan 19, 2014
```
This should make no difference but the variable will be used in a subsequent commit
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  8893f31e
18 Jan, 2014 21 commits

avcodec/dnxhdenc: return meaningful return codes · b9bedb0b

Timothy Gu authored Jan 18, 2014

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

b9bedb0b

Merge remote-tracking branch 'qatar/master' · a52fbe51

Michael Niedermayer authored Jan 18, 2014

* qatar/master:
  h264: check that an IDR NAL only contains I slices
Merged-by: Michael Niedermayer <michaelni@gmx.at>

a52fbe51

Merge commit '' · 2510e820

Michael Niedermayer authored Jan 18, 2014

* commit '9ecabd78':
  h264: reset num_reorder_frames if it is invalid

Note, num_reorder_frames is not used in the failure case
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2510e820

Merge commit '' · 87e46dd5

Michael Niedermayer authored Jan 18, 2014

* commit '0652e024':
  h264: reset ref count if decoding the slice header fails
Merged-by: Michael Niedermayer <michaelni@gmx.at>

87e46dd5

Merge commit '' · 59fb3c4b

Michael Niedermayer authored Jan 18, 2014

* commit '98cc9efc':
  h264: prevent two matching fields from being both a short/long ref combination

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

59fb3c4b

Merge commit '' · 32961030

Michael Niedermayer authored Jan 18, 2014

* commit '00dbff4c':
  h264: do not call field_end if we do not have a current picture
Merged-by: Michael Niedermayer <michaelni@gmx.at>

32961030

Merge commit '' · f2cb3b36

Michael Niedermayer authored Jan 18, 2014

* commit '7f0e81db':
  h264: limit allowed pred modes in ff_h264_check_intra_pred_mode() to 3

Conflicts:
	libavcodec/h264.c

See: d6a33f5d
See: 2005fddcMerged-by: Michael Niedermayer <michaelni@gmx.at>

f2cb3b36

Merge commit '' · 357a733f

Michael Niedermayer authored Jan 18, 2014

* commit 'd1b3fabe':
  h264: reset first_field if frame_start() fails for missing refs

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

357a733f

Merge commit '' · 06637c92

Michael Niedermayer authored Jan 18, 2014

* commit '21088111':
  Prepare for 10_alpha2 Release

Conflicts:
	RELEASE

Not merged
Merged-by: Michael Niedermayer <michaelni@gmx.at>

06637c92

h264: check that an IDR NAL only contains I slices · 8b2e5e42
Anton Khirnov authored Nov 28, 2013
```
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
```
8b2e5e42

h264: reset num_reorder_frames if it is invalid · 9ecabd78

Anton Khirnov authored Nov 28, 2013

An invalid VUI is not considered a fatal error, so the SPS containing it
may still be used. Leaving an invalid value of num_reorder_frames there
can result in writing over the bounds of H264Context.delayed_pic.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

9ecabd78

h264: reset ref count if decoding the slice header fails · 0652e024

Anton Khirnov authored Nov 28, 2013

Otherwise the ER code might try to use some already freed references.

Fixes possible access to freed memory.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

0652e024

h264: prevent two matching fields from being both a short/long ref combination · 98cc9efc
Anton Khirnov authored Nov 28, 2013
```
Fixes possible access to freed memory.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
```
98cc9efc
h264: do not call field_end if we do not have a current picture · 00dbff4c
Anton Khirnov authored Nov 28, 2013
```
Fixes invalid reads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
```
00dbff4c

h264: limit allowed pred modes in ff_h264_check_intra_pred_mode() to 3 · 7f0e81db

Anton Khirnov authored Nov 28, 2013

Higher modes are not allowed for 16x16/chroma, which is what this
function is used for. Otherwise this function would return 0 (vertical
prediction) for invalid higher modes, which could result in invalid
reads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

7f0e81db

h264: reset first_field if frame_start() fails for missing refs · d1b3fabe

Anton Khirnov authored Nov 28, 2013

In this case we may not have a current frame, while first_field being
set implies we do.

Fixes invalid reads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

d1b3fabe

swresample: Add arm&x86 clobber tests · 3dd04cbc
Martin Storsjö authored Jan 18, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
3dd04cbc

vp9/x86: rename ff_avg[48]_sse to ff_avg[48]_mmxext · 26800e38

James Almer authored Jan 18, 2014

pavgb is an sse integer instruction, so the mmxext flag is enough
Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

26800e38

Prepare for 10_alpha2 Release · 21088111
Reinhard Tartler authored Jan 18, 2014

21088111
avcodec/mpegvideo_enc: fix custom matrixes with jpeg · 0117ba55
Michael Niedermayer authored Jan 18, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
0117ba55

x86inc: speed up compilation with yasm · 4d55fe72

Loren Merritt authored Jan 16, 2014

Work around yasm's inefficiency with handling large numbers of variables
in the global scope.

4d55fe72

17 Jan, 2014 14 commits
- ffmpeg: change ost->finished to an enum · 740e6042
  Michael Niedermayer authored Jan 17, 2014
```
Idea-by: ramiro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  740e6042
- ffmpeg: update statistics only when a packet is actually muxed · d73f8976
  Michael Niedermayer authored Jan 15, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  d73f8976
- ffmpeg/flush_encoders: dont mux packets once ost->finished has been set · 5c459504
  Michael Niedermayer authored Jan 15, 2014
```
Fixes muxing frames after av_interleaved_write_frame() failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  5c459504
- ffmpeg: properly close down muxers on av_interleaved_write_frame() failure · 706741e8
  Michael Niedermayer authored Jan 14, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  706741e8
- ffmpeg: check ost->finished in check_output_constraints() · 4ff77d44
  Michael Niedermayer authored Jan 14, 2014
```
No testcase but it seems logic to stop when finished is set
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  4ff77d44
- ffmpeg: check ost->finished in reap_filters() · 7d91fb30
  Michael Niedermayer authored Jan 14, 2014
```
This avoids finished output streams continuing to receive frames
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  7d91fb30
- avformat/metadata: allow ff_metadata_conv() to be called with NULL saftely · ed7f1a5c
  Michael Niedermayer authored Jan 17, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  ed7f1a5c
- avfilter/vf_elbg: Fixed seed range of elbg filter · 447d71b8
  João Bernardo authored Jan 17, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  447d71b8
- avcodec/dnxhdenc: check that qmax is within the supported range · 19df5dcb
  Michael Niedermayer authored Jan 17, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  19df5dcb
- dnxhdenc: fix mb_rc size · f1caaa1c
  Michael Niedermayer authored Jan 17, 2014
```
Fixes out of array access with RC_VARIANCE set to 0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  f1caaa1c
- avformat/riff: fix demuxing of h264 INMC · ee27b113
  Michael Niedermayer authored Jan 17, 2014
```
Its said that there was a mpeg4 sample with the same fourcc, but noone has it
if someone finds it please tell me so i can fix detection of both.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  ee27b113
- Merge remote-tracking branch 'cehoyos/master' · 68ed0b6c
  Michael Niedermayer authored Jan 17, 2014
```
* cehoyos/master:
  Fix libxvid crash on failing initialisation.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  68ed0b6c
- Merge remote-tracking branch 'qatar/master' · f1edf881
  Michael Niedermayer authored Jan 17, 2014
```
* qatar/master:
  avisynth: fix setting packet properties

See: 4cb9c201Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  f1edf881
- Merge commit '104a97be' · cd259cda
  Michael Niedermayer authored Jan 17, 2014
```
* commit '104a97be':
  buffersrc: handle non-refcounted frames in av_buffersrc_add_frame() correctly

Conflicts:
	libavfilter/buffersrc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  cd259cda