Commits · 0062869ae25007c8506517dcfcbe6f439dc6958a · Linshizhi / ffmpeg.wasm-core

12 Nov, 2013 6 commits

avformat/smacker: check width/height in probe · 0062869a
Michael Niedermayer authored Nov 12, 2013
```
Fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
0062869a

avcodec/mpegvideo_motion: Handle edge emulation even without unrestricted_mv · 7b1e0beb

Michael Niedermayer authored Nov 12, 2013

Fixes out of array reads
Fixes part of: MSVR 440 (the other issues seem to have been fixed already)
Found-by: Jeremy Brown (jerbrown) of ReSP
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

7b1e0beb

MAINTAINERS: Add 1.2 back to the maintained releases · 8146ee7a
Michael Niedermayer authored Nov 12, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
8146ee7a

Fix example in pullup documentation. · 6d90a5c1

Lou Logan authored Nov 12, 2013

The pullup filter does not work well with the fps filter, it
currently needs -r
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>

6d90a5c1

libavcodec/xsubenc.c: set coded_bits_per_sample · da9d3605

Erik Olofsson authored Nov 07, 2013

Explicitly set the number of bits per sample to stop
the avi muxer from guessing at 24 bits.
The result is that bits per pixel in the avi stream header
matches what other XSUB muxers produce, such as AVIAddXSubs.exe
Signed-off-by: Erik Olofsson <eaj.olofsson@gmail.com>
Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

da9d3605

libavcodec/xsubenc.c: Fix bounding box coordinates · 3b1dcdec

Erik Olofsson authored Nov 07, 2013

Fix coordinates of the lower right corner of the text area.
Note that the coordinates are redundant as the size and
position of the text area are known.
Many decoders (including Sony Playstation 3, VLC and FFmpeg)
ignore the redundant coordinates.
Some hardware decoders need them for correct playback.

Verified on Philips DVD player models HTS7201 and DVP3380.

Fixes ticket #3031
Signed-off-by: Erik Olofsson <eaj.olofsson@gmail.com>
Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

3b1dcdec

11 Nov, 2013 10 commits

Merge remote-tracking branch 'cus/stable' · 355cea8d

Michael Niedermayer authored Nov 11, 2013

* cus/stable:
  libzvbi-teletextdec: propagate errors generated in page handler
  libzvbi-teletextdec: dont ignore memory allocation error silently
  libzvbi-teletextdec: output ass subtitles instead of plain text
  ass: move text_event_to_ass from textdec.c to ass.c and export it
  ass: fix error handling in ff_ass_add_subrect
  ass: factor out ff_ass_bprint_dialog
  libzvbi-teletextdec: use AVBPrint for whitespace cleanup
  libzvbi-teletextdec: use option constants instead of strings
  libzvbi-teletextdec: fix indentation after last commit
  libzvbi-teletextdec: support multiple teletext pages in a single packet
Merged-by: Michael Niedermayer <michaelni@gmx.at>

355cea8d

Merge remote-tracking branch 'qatar/master' · 43bf4297

Michael Niedermayer authored Nov 11, 2013

* qatar/master:
  mpegaudioenc: Move some static tables to MpegAudioContext

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

43bf4297

Merge commit '' · afc660ab

Michael Niedermayer authored Nov 11, 2013

* commit '5d6a990c':
  mpegaudioenc: Remove broken integer-only quantization code path

Conflicts:
	libavcodec/mpegaudioenc.c

Mostly not merged, the integer code works fine.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

afc660ab

avformat/electronicarts: check chunksize more completely in probe() · f9b89b61
Michael Niedermayer authored Nov 11, 2013
```
Fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
f9b89b61
avformat/electronicarts: check chunk size. · 20769d93
Michael Niedermayer authored Nov 11, 2013
```
Fix infinite loop
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
20769d93
avformat/dfa: check first frame offset in probe · bdab2421
Michael Niedermayer authored Nov 11, 2013
```
Fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
bdab2421
avformat/bethsoftvid: check 4th header byte in probe · f66f3819
Michael Niedermayer authored Nov 11, 2013
```
Fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
f66f3819
avformat/avr: check channels and bps in probe · 650fd9c0
Michael Niedermayer authored Nov 11, 2013
```
Fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
650fd9c0

avformat/utils: disabled debug code to collect format probing statistics · 676bc505

Michael Niedermayer authored Nov 09, 2013

This allows collecting statistics on probing scores and the amount of data
probing needed for various files and formats.
For example it can be used to find out which formats tend to need more
data for probing or which files are probed with less certain/lower scores
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

676bc505

doc: delete viterbi.txt · a7f35afb

Timothy Gu authored Nov 09, 2013

The description has been moved to the FFmpeg wiki:
https://trac.ffmpeg.org/wiki/ViterbiAlgorithmSigned-off-by: Timothy Gu <timothygu99@gmail.com>

a7f35afb

10 Nov, 2013 24 commits
- ffmpeg: remove unneeded include "libswscale/swscale.h" · 8cdf4e08
  Michael Niedermayer authored Nov 10, 2013
```
Found-by: ramiro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  8cdf4e08
- libzvbi-teletextdec: propagate errors generated in page handler · c0479f0f
  Marton Balint authored Oct 25, 2013
```
Signed-off-by: Marton Balint <cus@passwd.hu>
```
  c0479f0f
- libzvbi-teletextdec: dont ignore memory allocation error silently · 4947b062
  Marton Balint authored Oct 25, 2013
```
Signed-off-by: Marton Balint <cus@passwd.hu>
```
  4947b062
- libzvbi-teletextdec: output ass subtitles instead of plain text · 3c4b5275
  Marton Balint authored Oct 23, 2013
```
Signed-off-by: Marton Balint <cus@passwd.hu>
```
  3c4b5275
- avfilter/fade: use FADE_OUT macro. · 199b8fbd
  Clément Bœsch authored Nov 10, 2013
  
  199b8fbd
- avfilter/fade: remove a bunch of useless parenthesis. · 981128c2
  Clément Bœsch authored Nov 10, 2013
  
  981128c2
- avfilter/fade: use inlink->frame_count. · 461e810c
  Clément Bœsch authored Nov 10, 2013
  
  461e810c
- avfilter/fade: add color option. · 3e1097b9
  Clément Bœsch authored Nov 08, 2013
```
Fixes Ticket #1822.
```
  3e1097b9
- ass: move text_event_to_ass from textdec.c to ass.c and export it · b96325e0
  Marton Balint authored Oct 23, 2013
```
Signed-off-by: Marton Balint <cus@passwd.hu>
```
  b96325e0
- ass: fix error handling in ff_ass_add_subrect · 0f0a8d98
  Marton Balint authored Oct 23, 2013
```
Signed-off-by: Marton Balint <cus@passwd.hu>
```
  0f0a8d98
- ass: factor out ff_ass_bprint_dialog · f148954b
  Marton Balint authored Oct 23, 2013
```
Signed-off-by: Marton Balint <cus@passwd.hu>
```
  f148954b
- libzvbi-teletextdec: use AVBPrint for whitespace cleanup · 65fb59ab
  Marton Balint authored Oct 23, 2013
```
Signed-off-by: Marton Balint <cus@passwd.hu>
```
  65fb59ab
- libzvbi-teletextdec: use option constants instead of strings · b689b1f6
  Marton Balint authored Oct 20, 2013
```
Signed-off-by: Marton Balint <cus@passwd.hu>
```
  b689b1f6
- libzvbi-teletextdec: fix indentation after last commit · 688652e0
  Marton Balint authored Sep 29, 2013
```
Signed-off-by: Marton Balint <cus@passwd.hu>
```
  688652e0
- libzvbi-teletextdec: support multiple teletext pages in a single packet · a494757b
  Marton Balint authored Jul 28, 2013
```
After this patch, if a packet contains multiple teletext pages, the teletext
decoder can return the fist page and store the remaining pages in memory, and
return them to the user on the next calls to avcodec_decode_subtitle2.
Signed-off-by: Marton Balint <cus@passwd.hu>
```
  a494757b
- Merge remote-tracking branch 'qatar/master' · 78e150c5
  Michael Niedermayer authored Nov 10, 2013
```
* qatar/master:
  hwaccel: Simplify ff_find_hwaccel

Conflicts:
	libavcodec/mpeg12dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  78e150c5
- mpegaudioenc: Move some static tables to MpegAudioContext · 45ef9639
  Diego Biurrun authored Nov 04, 2013
```
This reduces global state and the amount of globally visible tables.
```
  45ef9639
- mpegaudioenc: Remove broken integer-only quantization code path · 5d6a990c
  Diego Biurrun authored Nov 09, 2013
  
  5d6a990c
- avformat/diracdec: check 2 chunks in probe · 2fbc759d
  Michael Niedermayer authored Nov 10, 2013
```
Fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  2fbc759d
- hwaccel: Simplify ff_find_hwaccel · 08303d77
  Luca Barbato authored Nov 09, 2013
```
It is always called by passing fields from an AVCodecContext.
```
  08303d77
- avformat/astdec: increase the score for odd samplerate/channels to max/8 · 023953e9
  Michael Niedermayer authored Nov 10, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  023953e9
- avformat/rsd: increase the score for odd samplerate/channels to max/8 · eb968023
  Michael Niedermayer authored Nov 10, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  eb968023
- avformat/lvfdec: increase the score for odd channels to max/8 · ef28694d
  Michael Niedermayer authored Nov 10, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  ef28694d
- avformat/swfdec: return AVPROBE_SCORE_MAX / 4 for unexpected versions · 9225ebd5
  Michael Niedermayer authored Nov 10, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  9225ebd5