Commits · eb058a8dc5acf01860bd103d0ae64e68715226bc · Linshizhi / ffmpeg.wasm-core

21 Mar, 2015 40 commits

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

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