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/omx.c | |
| parent | 373b82066cd4d0c7f42af9b03e8cdc1085e1a6e5 (diff) | |
| parent | 41ed7ab45fc693f7d7fc35664c0233f4c32d69bb (diff) | |
| download | ffmpeg-8ef57a0d6154119e1a616dd8c29e8c32e35808a0.tar.gz | |
Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'
* commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb':
cosmetics: Fix spelling mistakes
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec/omx.c')
| -rw-r--r-- | libavcodec/omx.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/omx.c b/libavcodec/omx.c index 887fc56378..674a0c3aa6 100644 --- a/libavcodec/omx.c +++ b/libavcodec/omx.c @@ -690,7 +690,7 @@ static av_cold int omx_encode_init(AVCodecContext *avctx) goto fail; } if (avctx->codec->id == AV_CODEC_ID_H264) { - // For H264, the extradata can be returned in two separate buffers + // For H.264, the extradata can be returned in two separate buffers // (the videocore encoder on raspberry pi does this); // therefore check that we have got both SPS and PPS before continuing. int nals[32] = { 0 }; @@ -847,7 +847,7 @@ static int omx_encode_frame(AVCodecContext *avctx, AVPacket *pkt, if (buffer->nFlags & OMX_BUFFERFLAG_ENDOFFRAME) { ret = pkt->size; pkt->pts = av_rescale_q(from_omx_ticks(buffer->nTimeStamp), AV_TIME_BASE_Q, avctx->time_base); - // We don't currently enable b-frames for the encoders, so set + // We don't currently enable B-frames for the encoders, so set // pkt->dts = pkt->pts. (The calling code behaves worse if the encoder // doesn't set the dts). pkt->dts = pkt->pts; @@ -897,7 +897,7 @@ static const AVClass omx_mpeg4enc_class = { }; AVCodec ff_mpeg4_omx_encoder = { .name = "mpeg4_omx", - .long_name = NULL_IF_CONFIG_SMALL("OpenMAX IL MPEG4 video encoder"), + .long_name = NULL_IF_CONFIG_SMALL("OpenMAX IL MPEG-4 video encoder"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_MPEG4, .priv_data_size = sizeof(OMXCodecContext), @@ -918,7 +918,7 @@ static const AVClass omx_h264enc_class = { }; AVCodec ff_h264_omx_encoder = { .name = "h264_omx", - .long_name = NULL_IF_CONFIG_SMALL("OpenMAX IL H264 video encoder"), + .long_name = NULL_IF_CONFIG_SMALL("OpenMAX IL H.264 video encoder"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_H264, .priv_data_size = sizeof(OMXCodecContext), |