Commits · db4234c5002fc0ac7ecae323874b97a4547ae0c3 · Linshizhi / ffmpeg.wasm-core

21 Mar, 2015 40 commits

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

Merge commit '' · c9841c05

Michael Niedermayer authored Mar 21, 2015

* commit 'a67f8ae9':
  h264: move mvd_table into the per-slice context

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

c9841c05

Merge commit '' · a4952e73

Michael Niedermayer authored Mar 21, 2015

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

a4952e73

Merge commit '' · 4c5c913d

Michael Niedermayer authored Mar 21, 2015

* commit 'e7226984':
  h264: move [{top,left}_]cbp into the per-slice context
Merged-by: Michael Niedermayer <michaelni@gmx.at>

4c5c913d

Merge commit '' · f5d4d618

Michael Niedermayer authored Mar 21, 2015

* commit '30da98ad':
  h264: move cabac[_state] into the per-slice context

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

f5d4d618

avcodec/h264_slice: Merge 2 memcpy() · d86e8f23
Michael Niedermayer authored Mar 21, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
d86e8f23

Merge commit '' · 739edc1a

Michael Niedermayer authored Mar 21, 2015

* commit 'bf03a878':
  h264: move mb[_{padding,luma_dc}] into the per-slice context

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

739edc1a

Merge commit '' · 35a788d9

Michael Niedermayer authored Mar 21, 2015

* commit 'b063582e':
  h264: move intra_pcm_ptr into the per-slice context

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

35a788d9

Merge commit '' · cc2cfdc4

Michael Niedermayer authored Mar 21, 2015

* commit '95eb35f3':
  h264: move the ref lists variables into the per-slice context

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

cc2cfdc4

Merge commit '' · 27b3522b

Michael Niedermayer authored Mar 21, 2015

* commit '77477266':
  h264: move map_col_to_list0[_field] into the per-slice context
Merged-by: Michael Niedermayer <michaelni@gmx.at>

27b3522b

Merge commit '' · bd76a482

Michael Niedermayer authored Mar 21, 2015

* commit 'ee0d774d':
  h264: move dist_scale_factor[_field] into the per-slice context
Merged-by: Michael Niedermayer <michaelni@gmx.at>

bd76a482

Merge commit '' · 20477a4e

Michael Niedermayer authored Mar 21, 2015

* commit 'be69f0a8':
  h264: move col_{parity,fieldoff} into the per-slice context
Merged-by: Michael Niedermayer <michaelni@gmx.at>

20477a4e

Merge commit '' · a8ac4c9b

Michael Niedermayer authored Mar 21, 2015

* commit '066aafce':
  h264: move direct_spatial_mv_pred into the per-slice context

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

a8ac4c9b

Merge commit '' · 4ffbeddd

Michael Niedermayer authored Mar 21, 2015

* commit 'ed451a08':
  h264: move sub_mb_type into the per-slice context

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

4ffbeddd

Merge commit '' · 97c8ecaa

Michael Niedermayer authored Mar 21, 2015

* commit '56febc99':
  h264: move the slice type variables into the per-slice context

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

97c8ecaa

Merge commit '' · 2cc08cad

Michael Niedermayer authored Mar 21, 2015

* commit '5f390eef':
  h264: move mb_[uv]linesize into the per-slice context

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

2cc08cad

Merge commit '' · 892a6d00

Michael Niedermayer authored Mar 21, 2015

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

892a6d00

Merge commit '' · f1436a7f

Michael Niedermayer authored Mar 21, 2015

* commit 'e6287f07':
  h264: move {mv,ref}_cache into the per-slice context

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

f1436a7f

Merge commit '' · b7e0356c

Michael Niedermayer authored Mar 21, 2015

* commit 'f69574cf':
  h264: move non_zero_count_cache into the per-slice context

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

b7e0356c

Merge commit '' · 6ec279b5

Michael Niedermayer authored Mar 21, 2015

* commit '64c81b2c':
  h264: move *_samples_available into the per-slice context

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

6ec279b5

avcodec/h264_cabac: Fix intra4x4_pred_mode_cache argument to av_dlog() · 20f5be10
Michael Niedermayer authored Mar 21, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
20f5be10

Merge commit '' · 6abd1e90

Michael Niedermayer authored Mar 21, 2015

* commit '7d8154ed':
  h264: move intra4x4_pred_mode[_cache] into the per-slice context

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

6abd1e90

Merge commit '' · 61635c7a

Michael Niedermayer authored Mar 21, 2015

* commit '8b00f4df':
  h264: move some neighbour information into the per-slice context

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

61635c7a

Merge commit '' · a2740a06

Michael Niedermayer authored Mar 21, 2015

* commit '4bd5ac20':
  h264: move {chroma,intra16x16}_pred_mode into the per-slice context
Merged-by: Michael Niedermayer <michaelni@gmx.at>

a2740a06

Merge commit '' · c07b7e48

Michael Niedermayer authored Mar 21, 2015

* commit '5355ed6b':
  h264: move {prev,next}_mb_skipped into the per-slice context
Merged-by: Michael Niedermayer <michaelni@gmx.at>

c07b7e48

Merge commit '' · acd6b407

Michael Niedermayer authored Mar 21, 2015

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

acd6b407

Merge commit '' · c27f53b9

Michael Niedermayer authored Mar 21, 2015

* commit 'd231e84b':
  h264: move the quantizers into the per-slice context

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

c27f53b9

Merge commit '' · cc31d9ce

Michael Niedermayer authored Mar 21, 2015

* commit 'd40ae0e5':
  h264: do not copy qscale when updating per-thread contexts
Merged-by: Michael Niedermayer <michaelni@gmx.at>

cc31d9ce

Merge commit '' · 756dc7bd

Michael Niedermayer authored Mar 21, 2015

* commit '92c6c2a6':
  h264: split weighted pred-related vars into per-slice context

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

756dc7bd

avcodec/hevc_ps: Check cropping parameters more correctly · 06c70d45
Michael Niedermayer authored Mar 21, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
06c70d45

Merge commit '' · 665e0c10

Michael Niedermayer authored Mar 21, 2015

* commit 'd8a45d2d':
  h264_ps: properly check cropping parameters against overflow

Conflicts:
	libavcodec/h264_ps.c

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

665e0c10

h264: move is_complex into the per-slice context · 07c5ca55
Anton Khirnov authored Jan 17, 2015

07c5ca55
h264: move mb_skip_run into the per-slice context · 47a0d393
Anton Khirnov authored Jan 17, 2015

47a0d393
h264: move redundant_pic_count into the per-slice context · 9951907f
Anton Khirnov authored Jan 17, 2015

9951907f