virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

lavc/mmaldec: reduce some diffs with Libav missed in previous skipped merges

Browse Source
This commit is contained in:
Clément Bœsch
2016-06-21 13:35:31 +02:00
parent ba5100ce84
commit d16aefee5c
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
libavcodec/mmaldec.c
View File

@@ -357,19 +357,19 @@ static av_cold int ffmmal_init_decoder(AVCodecContext *avctx)
format_in = decoder->input[0]->format; format_in = decoder->input[0]->format;
format_in->type = MMAL_ES_TYPE_VIDEO; format_in->type = MMAL_ES_TYPE_VIDEO;
switch (avctx->codec_id) { switch (avctx->codec_id) {
case AV_CODEC_ID_MPEG2VIDEO: case AV_CODEC_ID_MPEG2VIDEO:
format_in->encoding = MMAL_ENCODING_MP2V; format_in->encoding = MMAL_ENCODING_MP2V;
break; break;
case AV_CODEC_ID_MPEG4: case AV_CODEC_ID_MPEG4:
format_in->encoding = MMAL_ENCODING_MP4V; format_in->encoding = MMAL_ENCODING_MP4V;
break; break;
case AV_CODEC_ID_VC1: case AV_CODEC_ID_VC1:
format_in->encoding = MMAL_ENCODING_WVC1; format_in->encoding = MMAL_ENCODING_WVC1;
break; break;
case AV_CODEC_ID_H264: case AV_CODEC_ID_H264:
default: default:
format_in->encoding = MMAL_ENCODING_H264; format_in->encoding = MMAL_ENCODING_H264;
break; break;
} }
format_in->es->video.width = FFALIGN(avctx->width, 32); format_in->es->video.width = FFALIGN(avctx->width, 32);
format_in->es->video.height = FFALIGN(avctx->height, 16); 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 // being busy from decoder waiting for input. So just poll at the start and
// keep feeding new data to the buffer. // keep feeding new data to the buffer.
// We are pretty sure the decoder will produce output if we sent more input // 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. // excessive buffering.
// We also wait if we sent eos, but didn't receive it yet (think of decoding // We also wait if we sent eos, but didn't receive it yet (think of decoding
// stream with a very low number of frames). // stream with a very low number of frames).