Mercurial > libavcodec.hg
comparison h264.c @ 6524:01647ac078a7 libavcodec
typo: occured --> occurred
author | diego |
---|---|
date | Sat, 22 Mar 2008 01:06:57 +0000 |
parents | 48759bfbd073 |
children | e6d8c5bbeeac |
comparison
equal
deleted
inserted
replaced
6523:ae19192241c4 | 6524:01647ac078a7 |
---|---|
3855 * this will allso call MPV_common_init() and frame_start() as needed | 3855 * this will allso call MPV_common_init() and frame_start() as needed |
3856 * | 3856 * |
3857 * @param h h264context | 3857 * @param h h264context |
3858 * @param h0 h264 master context (differs from 'h' when doing sliced based parallel decoding) | 3858 * @param h0 h264 master context (differs from 'h' when doing sliced based parallel decoding) |
3859 * | 3859 * |
3860 * @return 0 if okay, <0 if an error occured, 1 if decoding must not be multithreaded | 3860 * @return 0 if okay, <0 if an error occurred, 1 if decoding must not be multithreaded |
3861 */ | 3861 */ |
3862 static int decode_slice_header(H264Context *h, H264Context *h0){ | 3862 static int decode_slice_header(H264Context *h, H264Context *h0){ |
3863 MpegEncContext * const s = &h->s; | 3863 MpegEncContext * const s = &h->s; |
3864 MpegEncContext * const s0 = &h0->s; | 3864 MpegEncContext * const s0 = &h0->s; |
3865 unsigned int first_mb_in_slice; | 3865 unsigned int first_mb_in_slice; |
4288 /** | 4288 /** |
4289 * decodes a residual block. | 4289 * decodes a residual block. |
4290 * @param n block index | 4290 * @param n block index |
4291 * @param scantable scantable | 4291 * @param scantable scantable |
4292 * @param max_coeff number of coefficients in the block | 4292 * @param max_coeff number of coefficients in the block |
4293 * @return <0 if an error occured | 4293 * @return <0 if an error occurred |
4294 */ | 4294 */ |
4295 static int decode_residual(H264Context *h, GetBitContext *gb, DCTELEM *block, int n, const uint8_t *scantable, const uint32_t *qmul, int max_coeff){ | 4295 static int decode_residual(H264Context *h, GetBitContext *gb, DCTELEM *block, int n, const uint8_t *scantable, const uint32_t *qmul, int max_coeff){ |
4296 MpegEncContext * const s = &h->s; | 4296 MpegEncContext * const s = &h->s; |
4297 static const int coeff_token_table_index[17]= {0, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3}; | 4297 static const int coeff_token_table_index[17]= {0, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3}; |
4298 int level[16]; | 4298 int level[16]; |