diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-21 20:32:52 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-21 20:32:52 +0400 |
commit | d27edc038a5d59f25b28964b38d9f8d7ce4a6e64 (patch) | |
tree | b43acbce10229c375ac3b21c80a6c2c09354da8d /libavformat/rtpdec_jpeg.c | |
parent | a41bf09d9c56215448f14fb086c9f882eb41ecac (diff) | |
parent | 511cf612ac979f536fd65e14603a87ca5ad435f3 (diff) |
Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3'
* commit '511cf612ac979f536fd65e14603a87ca5ad435f3':
miscellaneous typo fixes
Conflicts:
libavcodec/4xm.c
libavcodec/lagarith.c
libavcodec/parser.c
libavcodec/ratecontrol.c
libavcodec/shorten.c
libavcodec/vda_h264.c
libavformat/dvenc.c
libavformat/wtv.c
tools/patcheck
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpdec_jpeg.c')
-rw-r--r-- | libavformat/rtpdec_jpeg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rtpdec_jpeg.c b/libavformat/rtpdec_jpeg.c index 447dd361bc..391ae12cb3 100644 --- a/libavformat/rtpdec_jpeg.c +++ b/libavformat/rtpdec_jpeg.c @@ -370,7 +370,7 @@ static int jpeg_parse_packet(AVFormatContext *ctx, PayloadContext *jpeg, /* Prepare the JPEG packet. */ if ((ret = ff_rtp_finalize_packet(pkt, &jpeg->frame, st->index)) < 0) { av_log(ctx, AV_LOG_ERROR, - "Error occured when getting frame buffer.\n"); + "Error occurred when getting frame buffer.\n"); return ret; } |