38 lines
1.2 KiB
Diff
38 lines
1.2 KiB
Diff
Description: Replace deprecated FFmpeg API
|
|
Author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
|
|
Last-Update: <2015-11-02>
|
|
|
|
--- a/gview_encoder/encoder.c
|
|
+++ b/gview_encoder/encoder.c
|
|
@@ -1434,7 +1434,7 @@
|
|
/*convert default yuyv to y420p (libav input format)*/
|
|
switch(video_codec_data->codec_context->pix_fmt)
|
|
{
|
|
- case PIX_FMT_YUVJ420P:
|
|
+ case AV_PIX_FMT_YUVJ420P:
|
|
yuv422to420p(encoder_ctx, input_frame);
|
|
break;
|
|
default:
|
|
--- a/gview_v4l2core/jpeg_decoder.c
|
|
+++ b/gview_v4l2core/jpeg_decoder.c
|
|
@@ -1436,7 +1436,7 @@
|
|
exit(-1);
|
|
}
|
|
|
|
- codec_data->context->pix_fmt = PIX_FMT_YUV422P;
|
|
+ codec_data->context->pix_fmt = AV_PIX_FMT_YUV422P;
|
|
codec_data->context->width = width;
|
|
codec_data->context->height = height;
|
|
//jpeg_ctx->context->dsp_mask = (FF_MM_MMX | FF_MM_MMXEXT | FF_MM_SSE);
|
|
--- a/gview_v4l2core/uvc_h264.c
|
|
+++ b/gview_v4l2core/uvc_h264.c
|
|
@@ -970,7 +970,7 @@
|
|
}
|
|
|
|
h264_ctx->context->flags2 |= CODEC_FLAG2_FAST;
|
|
- h264_ctx->context->pix_fmt = PIX_FMT_YUV420P;
|
|
+ h264_ctx->context->pix_fmt = AV_PIX_FMT_YUV420P;
|
|
h264_ctx->context->width = width;
|
|
h264_ctx->context->height = height;
|
|
//h264_ctx->context->dsp_mask = (FF_MM_MMX | FF_MM_MMXEXT | FF_MM_SSE);
|