ffmpeg | branch: master | James Zern <jz...@google.com> | Wed Apr 22 14:16:39 2015 -0700| [db3f86871eb107242c381f106d083022d1adb005] | committer: James Zern
libvpxdec: cosmetics: reindent Signed-off-by: James Zern <jz...@google.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=db3f86871eb107242c381f106d083022d1adb005 --- libavcodec/libvpxdec.c | 83 ++++++++++++++++++++++++------------------------ 1 file changed, 42 insertions(+), 41 deletions(-) diff --git a/libavcodec/libvpxdec.c b/libavcodec/libvpxdec.c index 7faef3a..75231f8 100644 --- a/libavcodec/libvpxdec.c +++ b/libavcodec/libvpxdec.c @@ -60,55 +60,56 @@ static av_cold int vpx_init(AVCodecContext *avctx, } // returns 0 on success, AVERROR_INVALIDDATA otherwise -static int set_pix_fmt(AVCodecContext *avctx, struct vpx_image *img) { +static int set_pix_fmt(AVCodecContext *avctx, struct vpx_image *img) +{ if (avctx->codec_id == AV_CODEC_ID_VP8 && img->fmt != VPX_IMG_FMT_I420) return AVERROR_INVALIDDATA; switch (img->fmt) { - case VPX_IMG_FMT_I420: - avctx->pix_fmt = AV_PIX_FMT_YUV420P; - return 0; + case VPX_IMG_FMT_I420: + avctx->pix_fmt = AV_PIX_FMT_YUV420P; + return 0; #if CONFIG_LIBVPX_VP9_DECODER - case VPX_IMG_FMT_I422: - avctx->pix_fmt = AV_PIX_FMT_YUV422P; + case VPX_IMG_FMT_I422: + avctx->pix_fmt = AV_PIX_FMT_YUV422P; + return 0; + case VPX_IMG_FMT_I444: + avctx->pix_fmt = AV_PIX_FMT_YUV444P; + return 0; +#ifdef VPX_IMG_FMT_HIGHBITDEPTH + case VPX_IMG_FMT_I42016: + if (img->bit_depth == 10) { + avctx->pix_fmt = AV_PIX_FMT_YUV420P10LE; return 0; - case VPX_IMG_FMT_I444: - avctx->pix_fmt = AV_PIX_FMT_YUV444P; + } else if (img->bit_depth == 12) { + avctx->pix_fmt = AV_PIX_FMT_YUV420P12LE; return 0; -#ifdef VPX_IMG_FMT_HIGHBITDEPTH - case VPX_IMG_FMT_I42016: - if (img->bit_depth == 10) { - avctx->pix_fmt = AV_PIX_FMT_YUV420P10LE; - return 0; - } else if (img->bit_depth == 12) { - avctx->pix_fmt = AV_PIX_FMT_YUV420P12LE; - return 0; - } else { - return AVERROR_INVALIDDATA; - } - case VPX_IMG_FMT_I42216: - if (img->bit_depth == 10) { - avctx->pix_fmt = AV_PIX_FMT_YUV422P10LE; - return 0; - } else if (img->bit_depth == 12) { - avctx->pix_fmt = AV_PIX_FMT_YUV422P12LE; - return 0; - } else { - return AVERROR_INVALIDDATA; - } - case VPX_IMG_FMT_I44416: - if (img->bit_depth == 10) { - avctx->pix_fmt = AV_PIX_FMT_YUV444P10LE; - return 0; - } else if (img->bit_depth == 12) { - avctx->pix_fmt = AV_PIX_FMT_YUV444P12LE; - return 0; - } else { - return AVERROR_INVALIDDATA; - } + } else { + return AVERROR_INVALIDDATA; + } + case VPX_IMG_FMT_I42216: + if (img->bit_depth == 10) { + avctx->pix_fmt = AV_PIX_FMT_YUV422P10LE; + return 0; + } else if (img->bit_depth == 12) { + avctx->pix_fmt = AV_PIX_FMT_YUV422P12LE; + return 0; + } else { + return AVERROR_INVALIDDATA; + } + case VPX_IMG_FMT_I44416: + if (img->bit_depth == 10) { + avctx->pix_fmt = AV_PIX_FMT_YUV444P10LE; + return 0; + } else if (img->bit_depth == 12) { + avctx->pix_fmt = AV_PIX_FMT_YUV444P12LE; + return 0; + } else { + return AVERROR_INVALIDDATA; + } #endif #endif - default: - return AVERROR_INVALIDDATA; + default: + return AVERROR_INVALIDDATA; } } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog