diff options
| author | Clément Bœsch <clement@stupeflix.com> | 2016-06-21 13:35:31 +0200 |
|---|---|---|
| committer | Clément Bœsch <clement@stupeflix.com> | 2016-06-21 13:35:36 +0200 |
| commit | d16aefee5cf378021a0951bc0542ace90aef2b9d (patch) | |
| tree | 28aa6754af9cc89e91393d1030dd7a4ce170524a /libavcodec/mmaldec.c | |
| parent | ba5100ce84644923537f997dea39bf2e7b4b9c20 (diff) | |
| download | ffmpeg-d16aefee5cf378021a0951bc0542ace90aef2b9d.tar.gz | |
lavc/mmaldec: reduce some diffs with Libav missed in previous skipped merges
Diffstat (limited to 'libavcodec/mmaldec.c')
| -rw-r--r-- | libavcodec/mmaldec.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/libavcodec/mmaldec.c b/libavcodec/mmaldec.c index c85fb4e092..099a8c58e0 100644 --- a/libavcodec/mmaldec.c +++ b/libavcodec/mmaldec.c @@ -357,19 +357,19 @@ static av_cold int ffmmal_init_decoder(AVCodecContext *avctx) format_in = decoder->input[0]->format; format_in->type = MMAL_ES_TYPE_VIDEO; switch (avctx->codec_id) { - case AV_CODEC_ID_MPEG2VIDEO: - format_in->encoding = MMAL_ENCODING_MP2V; - break; - case AV_CODEC_ID_MPEG4: - format_in->encoding = MMAL_ENCODING_MP4V; - break; - case AV_CODEC_ID_VC1: - format_in->encoding = MMAL_ENCODING_WVC1; - break; - case AV_CODEC_ID_H264: - default: - format_in->encoding = MMAL_ENCODING_H264; - break; + case AV_CODEC_ID_MPEG2VIDEO: + format_in->encoding = MMAL_ENCODING_MP2V; + break; + case AV_CODEC_ID_MPEG4: + format_in->encoding = MMAL_ENCODING_MP4V; + break; + case AV_CODEC_ID_VC1: + format_in->encoding = MMAL_ENCODING_WVC1; + break; + case AV_CODEC_ID_H264: + default: + format_in->encoding = MMAL_ENCODING_H264; + break; } format_in->es->video.width = FFALIGN(avctx->width, 32); format_in->es->video.height = FFALIGN(avctx->height, 16); @@ -660,7 +660,7 @@ static int ffmmal_read_frame(AVCodecContext *avctx, AVFrame *frame, int *got_fra // being busy from decoder waiting for input. So just poll at the start and // keep feeding new data to the buffer. // We are pretty sure the decoder will produce output if we sent more input - // frames than what a h264 decoder could logically delay. This avoids too + // frames than what a H.264 decoder could logically delay. This avoids too // excessive buffering. // We also wait if we sent eos, but didn't receive it yet (think of decoding // stream with a very low number of frames). |