diff options
| author | Clément Bœsch <u@pkh.me> | 2016-06-21 21:55:20 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2016-06-21 21:55:34 +0200 |
| commit | 8ef57a0d6154119e1a616dd8c29e8c32e35808a0 (patch) | |
| tree | 26c51bc5d99260b44ba3a2585091ca764559f939 /libavcodec/h264_slice.c | |
| parent | 373b82066cd4d0c7f42af9b03e8cdc1085e1a6e5 (diff) | |
| parent | 41ed7ab45fc693f7d7fc35664c0233f4c32d69bb (diff) | |
Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'
* commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb':
cosmetics: Fix spelling mistakes
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec/h264_slice.c')
| -rw-r--r-- | libavcodec/h264_slice.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 6e7b940f2a..474400ba2f 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -21,7 +21,7 @@ /** * @file - * H.264 / AVC / MPEG4 part10 codec. + * H.264 / AVC / MPEG-4 part10 codec. * @author Michael Niedermayer <michaelni@gmx.at> */ @@ -128,7 +128,7 @@ static int alloc_scratch_buffers(H264SliceContext *sl, int linesize) av_fast_malloc(&sl->bipred_scratchpad, &sl->bipred_scratchpad_allocated, 16 * 6 * alloc_size); // edge emu needs blocksize + filter length - 1 - // (= 21x21 for h264) + // (= 21x21 for H.264) av_fast_malloc(&sl->edge_emu_buffer, &sl->edge_emu_buffer_allocated, alloc_size * 2 * 21); av_fast_mallocz(&sl->top_borders[0], &sl->top_borders_allocated[0], @@ -1022,7 +1022,7 @@ static enum AVPixelFormat non_j_pixfmt(enum AVPixelFormat a) /** * Decode a slice header. - * This will (re)intialize the decoder and call h264_frame_start() as needed. + * This will (re)initialize the decoder and call h264_frame_start() as needed. * * @param h h264context * |