generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  hevc: move DSP declarations from hevc.h into hevcdsp.h

Conflicts:
	libavcodec/hevc.h
	libavcodec/hevcdsp.c
	libavcodec/hevcdsp.h

See: c8dd048ab8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-12-22 12:43:43 +01:00
parent 6fe5f770db 7398e0516f
commit 5410a5dc66
3 changed files with 66 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/hevc.h
View File

@@ -663,19 +663,6 @@ typedef struct TransformUnit {
uint8_t is_cu_qp_delta_coded;
} TransformUnit;
typedef struct SAOParams {
int offset_abs[3][4]; ///< sao_offset_abs
int offset_sign[3][4]; ///< sao_offset_sign
int band_position[3]; ///< sao_band_position
int eo_class[3]; ///< sao_eo_class
int offset_val[3][5]; ///<SaoOffsetVal
uint8_t type_idx[3]; ///< sao_type_idx
} SAOParams;
typedef struct DBParams {
int beta_offset;
int tc_offset;