diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-17 12:13:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-17 12:13:22 +0200 |
| commit | 15141f939dc725451644869f4d413adb46927677 (patch) | |
| tree | e0aba01c6ebbe093e4b3265ae94f639628c1053f /libavcodec/dvdata.h | |
| parent | 68ca49dc7256bbe413ce29fa3fc47bb4143304c0 (diff) | |
| parent | 8b84e082ed27fb635fca524fbd14b1db094ee8b0 (diff) | |
| download | ffmpeg-streaming-15141f939dc725451644869f4d413adb46927677.zip ffmpeg-streaming-15141f939dc725451644869f4d413adb46927677.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
indeo3: add parens around some macro arguments
h264: use proper PROLOGUE statement for a function using 8 registers.
doc: Update sample Vim config with suitable (function) indentation settings.
dv: Merge dvquant.h into dvdata.c where all other DV tables reside.
dv: Move static tables only used in one place to where they are used.
graphparser: set next to NULL on an entry extracted from inputs list
doc/filters: update documentation.
avconv: flush decoders immediately after an EOF.
avconv: send EOF to vsrc_buffer.
avconv: reindent.
Conflicts:
doc/filters.texi
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dvdata.h')
| -rw-r--r-- | libavcodec/dvdata.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/libavcodec/dvdata.h b/libavcodec/dvdata.h index 9a6ac89..c244fad 100644 --- a/libavcodec/dvdata.h +++ b/libavcodec/dvdata.h @@ -104,6 +104,16 @@ enum dv_pack_type { dv_unknown_pack = 0xff, }; +extern const uint8_t ff_dv_quant_shifts[22][4]; +extern const uint8_t ff_dv_quant_offset[4]; + +extern const int ff_dv_iweight_88[64]; +extern const int ff_dv_iweight_248[64]; +extern const int ff_dv_iweight_1080_y[64]; +extern const int ff_dv_iweight_1080_c[64]; +extern const int ff_dv_iweight_720_y[64]; +extern const int ff_dv_iweight_720_c[64]; + #define DV_PROFILE_IS_HD(p) ((p)->video_stype & 0x10) #define DV_PROFILE_IS_1080i50(p) (((p)->video_stype == 0x14) && ((p)->dsf == 1)) #define DV_PROFILE_IS_720p50(p) (((p)->video_stype == 0x18) && ((p)->dsf == 1)) |
