Commits · def18e5470bdcddb9d737784cc6ae427c195da7c · Linshizhi / ffmpeg.wasm-core

23 Dec, 2012 9 commits

Michael Niedermayer authored Dec 23, 2012

* commit 'b047c687':
  4xm: don't rely on get_buffer() initializing the frame.
  huffyuv: split encoder and decoder into separate files.
  lavc: make pkt_{p,d}ts doxy less confusing

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

def18e54

Merge commit '' · 2f9903f6

Michael Niedermayer authored Dec 23, 2012

* commit '418693bd':
  lavc: rewrite and extend AVFrame doxy
  opt: avoid segfault in av_opt_next() if the class does not have an option list
  ttadec: fix last frame handling when seeking
  alacdec: do not be too strict about the extradata size

Conflicts:
	libavcodec/alac.c
	libavcodec/avcodec.h
	libavcodec/tta.c
	libavutil/opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2f9903f6

4xm: don't rely on get_buffer() initializing the frame. · b047c687
Anton Khirnov authored Nov 13, 2012

b047c687
huffyuv: split encoder and decoder into separate files. · 2ca5ca29
Anton Khirnov authored Dec 06, 2012

2ca5ca29
lavc: make pkt_{p,d}ts doxy less confusing · 6e5c44b0
Anton Khirnov authored Dec 21, 2012

6e5c44b0
lavc: rewrite and extend AVFrame doxy · 418693bd
Anton Khirnov authored Dec 21, 2012

418693bd
libpostproc: fix leak of 2kb · f9d8658d
Michael Niedermayer authored Dec 23, 2012
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
f9d8658d
mpegvideo_enc: fix edge emulation of dimension%16 != 0 for YUV != 420 · ca9eb930
Michael Niedermayer authored Dec 23, 2012
```
Fixes Ticket2041
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
ca9eb930
lavf/y4m: spellcheck · 707af43d
James Darnley authored Dec 22, 2012
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
707af43d

22 Dec, 2012 22 commits
- rmdec: set bit rate for ra4 · 2e6bd22b
  Piotr Bandurski authored Dec 22, 2012
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  2e6bd22b
- docs: point to aresample from asyncts docs · bc5d6e4b
  Michael Niedermayer authored Dec 18, 2012
```
"Fixes" Ticket2036
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  bc5d6e4b
- lavf/hlsenc: reuse pattern string, rather than redefining it · 60c801c6
  Stefano Sabatini authored Dec 20, 2012
```
Improve robustness.
```
  60c801c6
- lavf/hlsenc: fix basename size computation off-by-one bug · 005b360b
  Stefano Sabatini authored Dec 20, 2012
  
  005b360b
- opt: avoid segfault in av_opt_next() if the class does not have an option list · d02202e0
  Justin Ruggles authored Nov 08, 2012
```
CC: libav-stable@libav.org
```
  d02202e0
- ttadec: fix last frame handling when seeking · 5778299c
  Justin Ruggles authored Feb 10, 2012
```
Using a frame count, as is done currently, does not work at all with
seeking. Instead, when the number of samples in the final frame has
been decoded, we check if only the 32-bit CRC is remaining. If so, we
assume that it is the final frame.

There is no longer a need to keep total_frames in TTAContext.
```
  5778299c
- configure: consider using /usr/include/openjpeg-1.5 when searching for openjpeg · e749b5dd
  Johannes Nixdorf authored Dec 16, 2012
```
Beginning with version 1.5.1 openjpeg defaults to install its headers to
/usr/include/openjpeg-${major}.${minor} instead of /usr/include without
providing a compatibility symlink making the old test fail.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  e749b5dd
- h264: Detect POC inconsistencies and try to handle them reasonably · 985aa0be
  Michael Niedermayer authored Dec 22, 2012
```
Improves the file from Ticket2050
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  985aa0be
- alacdec: do not be too strict about the extradata size · 68a04b0c
  Justin Ruggles authored Dec 22, 2012
```
Sometimes the extradata has duplicate atoms, but that shouldn't prevent
decoding. Just ensure that it is at least 36 bytes as a sanity check.

CC: libav-stable@libav.org
```
  68a04b0c
- Changelog: add entry about the new documentation layout design · 5715d67b
  Stefano Sabatini authored Dec 21, 2012
  
  5715d67b
- doc/filters: reword introduction sentence of aformat. · 1330d1d0
  Clément Bœsch authored Dec 22, 2012
  
  1330d1d0
- doc/filters: simplify escaping in aformat. · ba5ea7db
  Clément Bœsch authored Dec 22, 2012
```
Escaping the '=' is not necessary, and quoting the arguments allow to
remove the comma escaping as well.
```
  ba5ea7db
- doc/filters: add overlay daisy-chaining example · 0824aa67
  Stefano Sabatini authored Dec 15, 2012
  
  0824aa67
- doc/filters: rework and itemize examples for the overlay filter · 35b97ad7
  Stefano Sabatini authored Dec 15, 2012
  
  35b97ad7
- lavfi/overlay: make use of av_opt_set_from_string() · bde1e8bf
  Stefano Sabatini authored Dec 15, 2012
```
Simplify.
```
  bde1e8bf
- lavfi/overlay: switch to filter_frame API · 5e402a53
  Stefano Sabatini authored Dec 08, 2012
  
  5e402a53
- Merge remote-tracking branch 'qatar/master' · 98256622
  Michael Niedermayer authored Dec 22, 2012
```
* qatar/master:
  flac: only set channel layout if not previously set or on channel count change
  prepare 9_beta3 release

Conflicts:
	RELEASE
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  98256622
- flac: only set channel layout if not previously set or on channel count change · aef51507
  Justin Ruggles authored Dec 16, 2012
```
Fixes Bug 402
```
  aef51507
- ffplay: fix another use of context instead of frame parameters · 3f72dbe4
  Michael Niedermayer authored Dec 21, 2012
```
Fixes Ticket2050
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  3f72dbe4
- 4xm: check the correct stream, fix fate · 5ffb5e7a
  Michael Niedermayer authored Dec 22, 2012
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  5ffb5e7a
- lavc/4xm: use bytestream2_get_bytes_left · 44fe118e
  Paul B Mahol authored Dec 18, 2012
```
Also replace relevant bytestream2 functions with unchecked variants due
code that already checks for overreads.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
  44fe118e
- doc/filters: rename reference to movie filter from "src_movie" to "movie" · 6b50df6b
  Stefano Sabatini authored Dec 22, 2012
```
Should be less confusing.
```
  6b50df6b
21 Dec, 2012 9 commits

videodsp: Fix project name · e16bac7b

Michael Niedermayer authored Dec 21, 2012

These are all part of splited out dsp utils from FFmpeg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

e16bac7b

x86/videodsp_init: Add back lost author attribution · 90eaa989

Michael Niedermayer authored Dec 21, 2012

Code originates from:
910b9f30 libavcodec/dsputil.c (David Conrad 2010-05-27 04:39:27 +0000 334) void ff_emulated_edge_mc(uint8_t *buf, const uint8_t *src, int linesize, int block_w, int block_h,
93a21abd libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-14 18:37:35 +0000 335) int src_x, int src_y, int w, int h){
93a21abd libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-14 18:37:35 +0000 336) int x, y;
93a21abd libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-14 18:37:35 +0000 337) int start_y, start_x, end_y, end_x;
b5a093b3 libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-25 20:22:36 +0000 338)
93a21abd libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-14 18:37:35 +0000 339) if(src_y>= h){
93a21abd libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-14 18:37:35 +0000 340) src+= (h-1-src_y)*linesize;
93a21abd libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-14 18:37:35 +0000 341) src_y=h-1;
225f9c44 libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-15 00:25:53 +0000 342) }else if(src_y<=-block_h){
225f9c44 libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-15 00:25:53 +0000 343) src+= (1-block_h-src_y)*linesize;
225f9c44 libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-15 00:25:53 +0000 344) src_y=1-block_h;
93a21abd libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-14 18:37:35 +0000 345) }
93a21abd libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-14 18:37:35 +0000 346) if(src_x>= w){
93a21abd libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-14 18:37:35 +0000 347) src+= (w-1-src_x);
93a21abd libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-14 18:37:35 +0000 348) src_x=w-1;
225f9c44 libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-15 00:25:53 +0000 349) }else if(src_x<=-block_w){
225f9c44 libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-15 00:25:53 +0000 350) src+= (1-block_w-src_x);
225f9c44 libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-15 00:25:53 +0000 351) src_x=1-block_w;
93a21abd libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-14 18:37:35 +0000 352) }
93a21abd libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-14 18:37:35 +0000 353)
b8a78f41 libavcodec/mpegvideo.c (Michael Niedermayer 2002-11-10 11:46:59 +0000 354) start_y= FFMAX(0, -src_y);
b8a78f41 libavcodec/mpegvideo.c (Michael Niedermayer 2002-11-10 11:46:59 +0000 355) start_x= FFMAX(0, -src_x);
b8a78f41 libavcodec/mpegvideo.c (Michael Niedermayer 2002-11-10 11:46:59 +0000 356) end_y= FFMIN(block_h, h-src_y);
b8a78f41 libavcodec/mpegvideo.c (Michael Niedermayer 2002-11-10 11:46:59 +0000 357) end_x= FFMIN(block_w, w-src_x);
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

90eaa989

videodsp_template.c: fix year · 28286a63
Michael Niedermayer authored Dec 21, 2012
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
28286a63

doc/default.css: use ffmpeg.org website CSS · e64a7f2c

Stefano Sabatini authored Dec 20, 2012

The attribute container of the top-level div is changed from "class" to
"id" to match the website CSS.

Improve consistency between website docs and local documentation style.

e64a7f2c

doc: move HTML CSS to a dedicated file default.css · 042c2a1a
Stefano Sabatini authored Dec 20, 2012

042c2a1a
lavfi: declare arrays that never change as static const · 185d1f3b
Paul B Mahol authored Dec 21, 2012
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
185d1f3b

img2enc: fix typo · 165be91c

Michael Niedermayer authored Dec 21, 2012

Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

165be91c

lavc: Warn in case the set bitrate is very low · 2f436b1f
Michael Niedermayer authored Dec 21, 2012
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
2f436b1f

better failure message for img2enc · d828bae9

rogerdpack authored Dec 20, 2012

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

d828bae9