summaryrefslogtreecommitdiff
path: root/libavcodec/h264.c
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2008-03-22 01:06:57 +0000
committerDiego Biurrun <diego@biurrun.de>2008-03-22 01:06:57 +0000
commitd9526386990bccd61d8773e993e47fceb55b0174 (patch)
treeec1e3ead18f9261a01589001e89072546d33ede9 /libavcodec/h264.c
parent4edfceccec5a4f5f62415904dd008a2ab23f5d83 (diff)
typo: occured --> occurred
Originally committed as revision 12549 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h264.c')
-rw-r--r--libavcodec/h264.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 26bd3b5d4e..46614918c1 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -3857,7 +3857,7 @@ static void clone_slice(H264Context *dst, H264Context *src)
* @param h h264context
* @param h0 h264 master context (differs from 'h' when doing sliced based parallel decoding)
*
- * @return 0 if okay, <0 if an error occured, 1 if decoding must not be multithreaded
+ * @return 0 if okay, <0 if an error occurred, 1 if decoding must not be multithreaded
*/
static int decode_slice_header(H264Context *h, H264Context *h0){
MpegEncContext * const s = &h->s;
@@ -4290,7 +4290,7 @@ static inline int get_dct8x8_allowed(H264Context *h){
* @param n block index
* @param scantable scantable
* @param max_coeff number of coefficients in the block
- * @return <0 if an error occured
+ * @return <0 if an error occurred
*/
static int decode_residual(H264Context *h, GetBitContext *gb, DCTELEM *block, int n, const uint8_t *scantable, const uint32_t *qmul, int max_coeff){
MpegEncContext * const s = &h->s;