Fix Old Pixel format to New one

Change-Id: Ic238f65e2b1775dce3e575065f404dd876bf2867

diff --git a/formats/ffmpeg/mm_file_format_ffmpeg.c b/formats/ffmpeg/mm_file_format_ffmpeg.c
index 6cd8a42..d7306e0 100755 (executable)
--- a/formats/ffmpeg/mm_file_format_ffmpeg.c
+++ b/formats/ffmpeg/mm_file_format_ffmpeg.c
@@ -739,7 +739,7 @@ int mmfile_format_read_frame_ffmpg(MMFileFormatContext *formatContext, unsigned
                        height = pVideoCodecCtx->height;
                }
 
-               numBytes = avpicture_get_size(PIX_FMT_RGB24, width, height);
+               numBytes = avpicture_get_size(AV_PIX_FMT_RGB24, width, height);
                if (numBytes < 0) {
                        debug_error(DEBUG, "error: avpicture_get_size. [%d x %d]\n", width, height);
                        ret = MMFILE_FORMAT_FAIL;
@@ -753,7 +753,7 @@ int mmfile_format_read_frame_ffmpg(MMFileFormatContext *formatContext, unsigned
                        goto exception;
                }
 
-               ret = avpicture_fill((AVPicture *)pFrameRGB, frame->frameData, PIX_FMT_RGB24, width, height);
+               ret = avpicture_fill((AVPicture *)pFrameRGB, frame->frameData, AV_PIX_FMT_RGB24, width, height);
                if (ret < 0) {
                        debug_error(DEBUG, "error: avpicture_fill fail. errcode = 0x%08X\n", ret);
                        ret = MMFILE_FORMAT_FAIL;
@@ -763,7 +763,7 @@ int mmfile_format_read_frame_ffmpg(MMFileFormatContext *formatContext, unsigned
 #ifdef __MMFILE_FFMPEG_V085__
                struct SwsContext *img_convert_ctx = NULL;
 
-               img_convert_ctx = sws_getContext(width, height, pVideoCodecCtx->pix_fmt, width, height, PIX_FMT_RGB24, SWS_BICUBIC, NULL, NULL, NULL);
+               img_convert_ctx = sws_getContext(width, height, pVideoCodecCtx->pix_fmt, width, height, AV_PIX_FMT_RGB24, SWS_BICUBIC, NULL, NULL, NULL);
 
                if (NULL == img_convert_ctx) {
                        debug_error(DEBUG, "failed to get img convet ctx\n");
@@ -783,7 +783,7 @@ int mmfile_format_read_frame_ffmpg(MMFileFormatContext *formatContext, unsigned
                sws_freeContext(img_convert_ctx);
                img_convert_ctx = NULL;
 #else
-               ret = img_convert((AVPicture *)pFrameRGB, PIX_FMT_RGB24, (AVPicture *)pFrame, pVideoCodecCtx->pix_fmt, width, height);
+               ret = img_convert((AVPicture *)pFrameRGB, AV_PIX_FMT_RGB24, (AVPicture *)pFrame, pVideoCodecCtx->pix_fmt, width, height);
                if (ret < 0) {
                        debug_error(DEBUG, "failed to convet image\n");
                        ret = MMFILE_FORMAT_FAIL;

diff --git a/formats/ffmpeg/mm_file_format_frame.c b/formats/ffmpeg/mm_file_format_frame.c
index 65509c4..6d44449 100755 (executable)
--- a/formats/ffmpeg/mm_file_format_frame.c
+++ b/formats/ffmpeg/mm_file_format_frame.c
@@ -434,7 +434,7 @@ static int __mmfile_get_frame(AVFormatContext *pFormatCtx, double timestamp, boo
                        *height = pVideoCodecCtx->height;
                }
 
-               *size = avpicture_get_size(PIX_FMT_RGB24, *width, *height);
+               *size = avpicture_get_size(AV_PIX_FMT_RGB24, *width, *height);
 
                if (*size > 0)
                        *frame = mmfile_malloc(*size);
@@ -450,7 +450,7 @@ static int __mmfile_get_frame(AVFormatContext *pFormatCtx, double timestamp, boo
                debug_msg(RELEASE, "height : %d", *height);
                debug_msg(RELEASE, "frame : %p", *frame);
 
-               ret = avpicture_fill((AVPicture *)pFrameRGB, *frame, PIX_FMT_RGB24, *width, *height);
+               ret = avpicture_fill((AVPicture *)pFrameRGB, *frame, AV_PIX_FMT_RGB24, *width, *height);
                if (ret < 0) {
                        debug_error(DEBUG, "error: avpicture_fill fail. errcode = 0x%08X\n", ret);
                        ret = MMFILE_FORMAT_FAIL;
@@ -461,7 +461,7 @@ static int __mmfile_get_frame(AVFormatContext *pFormatCtx, double timestamp, boo
                struct SwsContext *img_convert_ctx = NULL;
 
                img_convert_ctx = sws_getContext(*width, *height, pVideoCodecCtx->pix_fmt,
-                                               *width, *height, PIX_FMT_RGB24, SWS_BICUBIC, NULL, NULL, NULL);
+                                               *width, *height, AV_PIX_FMT_RGB24, SWS_BICUBIC, NULL, NULL, NULL);
 
                if (NULL == img_convert_ctx) {
                        debug_error(DEBUG, "failed to get img convet ctx\n");
@@ -482,7 +482,7 @@ static int __mmfile_get_frame(AVFormatContext *pFormatCtx, double timestamp, boo
                sws_freeContext(img_convert_ctx);
                img_convert_ctx = NULL;
 #else
-               ret = img_convert((AVPicture *)pFrameRGB, PIX_FMT_RGB24, (AVPicture *)pFrame, pVideoCodecCtx->pix_fmt, *width, *height);
+               ret = img_convert((AVPicture *)pFrameRGB, AV_PIX_FMT_RGB24, (AVPicture *)pFrame, pVideoCodecCtx->pix_fmt, *width, *height);
                if (ret < 0) {
                        debug_error(DEBUG, "failed to convet image\n");
                        ret = MMFILE_FORMAT_FAIL;