Commits · fa7c08d5e192aea77fdfb7f52c44c196a3ba4452 · Linshizhi / ffmpeg.wasm-core

21 Mar, 2015 40 commits

Michael Niedermayer authored Mar 21, 2015

* commit 'c28ed1d7':
  h264: move [uv]linesize to the per-slice context

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

fa7c08d5

Merge commit '' · a6cb0534

Michael Niedermayer authored Mar 21, 2015

* commit 'b53569e0':
  h264_cabac: remove now unnecessary H264Context function parameters

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

a6cb0534

Merge commit '' · d8151a7e

Michael Niedermayer authored Mar 21, 2015

* commit 'a12d3188':
  h264: use a smaller struct for the ref lists

Conflicts:
	libavcodec/h264_direct.c
	libavcodec/h264_mb.c
	libavcodec/h264_picture.c
	libavcodec/h264_refs.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

d8151a7e

Merge commit '' · e970b576

Michael Niedermayer authored Mar 21, 2015

* commit '94295106':
  h264_mb: remove an unused function parameter
Merged-by: Michael Niedermayer <michaelni@gmx.at>

e970b576

Merge commit '' · 8c6370af

Michael Niedermayer authored Mar 21, 2015

* commit '2b4c38d3':
  h264: drop some mpegvideo remnants from draw_horiz_band()
Merged-by: Michael Niedermayer <michaelni@gmx.at>

8c6370af

Merge commit '' · 0f8bb0ef

Michael Niedermayer authored Mar 21, 2015

* commit '5bf3c0fa':
  h264: drop the now unused per-slice H264Contexts

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

0f8bb0ef

Merge commit '' · 8bdcec31

Michael Niedermayer authored Mar 21, 2015

* commit '51d8725a':
  h264: use the main H264Context as the parent for all slice contexts

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

8bdcec31

Merge commit '' · b1e6d8a2

Michael Niedermayer authored Mar 21, 2015

* commit '92e0b734':
  h264_slice: constify all the uses of H264Context during slice decoding
Merged-by: Michael Niedermayer <michaelni@gmx.at>

b1e6d8a2

vp9: make above buffer pointer 32-byte aligned. · 1fd1f58b
Ronald S. Bultje authored Mar 21, 2015
```
Fixes ticket #4383
Signed-off-by: James Almer <jamrial@gmail.com>
```
1fd1f58b

Merge commit '' · 84ae7294

Michael Niedermayer authored Mar 21, 2015

* commit '3178f4d3':
  h264: move rbsp_buffer into the per-slice context

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

84ae7294

Merge commit '' · 830e548b

Michael Niedermayer authored Mar 21, 2015

* commit '582683b6':
  h264: move remaining ER stuff into the per-slice context

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

830e548b

avcodec/mpegvideo: support mbskip_table==NULL in ff_print_debug_info2() · 44309dd2
Michael Niedermayer authored Mar 21, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
44309dd2
avcodec/error_resilience: Fix mbskip_table==NULL codepath · dd186b58
Michael Niedermayer authored Mar 21, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
dd186b58

Merge commit '' · b37b0a58

Michael Niedermayer authored Mar 21, 2015

* commit '5bc69f38':
  error_resilience: do not require mbintra/skip tables
Merged-by: Michael Niedermayer <michaelni@gmx.at>

b37b0a58

Merge commit '' · 44e4a86c

Michael Niedermayer authored Mar 21, 2015

* commit 'c377e04d':
  h264: move top_borders into the per-slice context

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

44e4a86c

Merge commit '' · 3d1d8e1f

Michael Niedermayer authored Mar 21, 2015

* commit '36d04801':
  h264: move the scratch buffers into the per-slice context

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

3d1d8e1f

Merge commit '' · 27301633

Michael Niedermayer authored Mar 21, 2015

* commit '34d4c605':
  h264_loopfilter: constify all uses of H264Context
Merged-by: Michael Niedermayer <michaelni@gmx.at>

27301633

Merge commit '' · e845b957

Michael Niedermayer authored Mar 21, 2015

* commit '7505c8df':
  h264_cavlc: constify all uses of H264Context
Merged-by: Michael Niedermayer <michaelni@gmx.at>

e845b957

Merge commit '' · eb058a8d

Michael Niedermayer authored Mar 21, 2015

* commit 'ba7e165b':
  h264_cabac: constify all uses of H264Context
Merged-by: Michael Niedermayer <michaelni@gmx.at>

eb058a8d

Merge commit '' · 9f2fad1a

Michael Niedermayer authored Mar 21, 2015

* commit '5c4b98de':
  h264.c: constify all uses of H264Context in slice and lower-level functions
Merged-by: Michael Niedermayer <michaelni@gmx.at>

9f2fad1a

Merge commit '' · 9d0450ae

Michael Niedermayer authored Mar 21, 2015

* commit 'e9b2383b':
  h264: move mb_mbaff into the per-slice context

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

9d0450ae

Merge commit '' · d511dc65

Michael Niedermayer authored Mar 21, 2015

* commit 'bc98e8c0':
  h264: move mb_field_decoding_flag into the per-slice context

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

d511dc65

Merge commit '' · a0b39747

Michael Niedermayer authored Mar 21, 2015

* commit '6490a0c0':
  h264_mb: constify all uses of H264Context

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

a0b39747

Merge commit '' · 06e5b331

Michael Niedermayer authored Mar 21, 2015

* commit '51822879':
  h264_mb: constify block_offset
Merged-by: Michael Niedermayer <michaelni@gmx.at>

06e5b331

Merge commit '' · bc5383e6

Michael Niedermayer authored Mar 21, 2015

* commit '3bea6409':
  h264_mvpred: constify all uses of H264Context
Merged-by: Michael Niedermayer <michaelni@gmx.at>

bc5383e6

Merge commit '' · a81a6dcb

Michael Niedermayer authored Mar 21, 2015

* commit '460176aa':
  h264.h: constify all uses of H264Context
Merged-by: Michael Niedermayer <michaelni@gmx.at>

a81a6dcb

Merge commit '' · 48d00b52

Michael Niedermayer authored Mar 21, 2015

* commit 'd27b8248':
  h264_direct: constify all uses of H264Context
Merged-by: Michael Niedermayer <michaelni@gmx.at>

48d00b52

Merge commit '' · 55215383

Michael Niedermayer authored Mar 21, 2015

* commit 'f42485db':
  h264: use a separate GetBitContext for slice data

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

55215383

Merge commit '' · 727b2023

Michael Niedermayer authored Mar 21, 2015

* commit '2ea00e35':
  h264: do not abuse the context as a temporary storage in get_last_needed_nal()

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

727b2023

Merge commit '' · eba2c232

Michael Niedermayer authored Mar 21, 2015

* commit '404a416d':
  h264: remove some remnants of data partitioning

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

eba2c232

Merge commit '' · 72bec029

Michael Niedermayer authored Mar 21, 2015

* commit '7bbc254d':
  h264: move resync_mb_{x,y} into the per-slice context

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

72bec029

Merge commit '' · d76559fb

Michael Niedermayer authored Mar 21, 2015

* commit 'd4d9068c':
  h264: move mb_{x,y} into the per-slice context

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

d76559fb

Merge commit '' · 668c65e7

Michael Niedermayer authored Mar 21, 2015

* commit '0edbe6fa':
  h264: move mb_xy into the per-slice context

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

668c65e7

Merge commit '' · db4234c5

Michael Niedermayer authored Mar 21, 2015

* commit '07c5ca55':
  h264: move is_complex into the per-slice context

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

db4234c5

Merge commit '' · 70eec8f4

Michael Niedermayer authored Mar 21, 2015

* commit '47a0d393':
  h264: move mb_skip_run into the per-slice context

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

70eec8f4

Merge commit '' · da7f4c32

Michael Niedermayer authored Mar 21, 2015

* commit '9951907f':
  h264: move redundant_pic_count into the per-slice context

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

da7f4c32

Merge commit '' · 04d23cf1

Michael Niedermayer authored Mar 21, 2015

* commit 'a9b201ca':
  h264: move cabac_init_idc into the per-slice context
Merged-by: Michael Niedermayer <michaelni@gmx.at>

04d23cf1

Merge commit '' · 7d239316

Michael Niedermayer authored Mar 21, 2015

* commit 'e6c90ce9':
  h264: move loopfilter parameters into the per-slice context
Merged-by: Michael Niedermayer <michaelni@gmx.at>

7d239316

Merge commit '' · ad6cee11

Michael Niedermayer authored Mar 21, 2015

* commit 'bd3e460b':
  h264: move direct_cache into the per-slice context
Merged-by: Michael Niedermayer <michaelni@gmx.at>

ad6cee11

Merge commit '' · 6a2e1ff0

Michael Niedermayer authored Mar 21, 2015

* commit '6479c79f':
  h264: move mvd_cache into the per-slice context
Merged-by: Michael Niedermayer <michaelni@gmx.at>

6a2e1ff0