(Record FFMPEG) Get rid of all the cplusplus ifdefs

Author: LibretroAdmin

record/drivers/record_ffmpeg.c

@@ -1189,11 +1189,9 @@ static bool encode_video(ffmpeg_t *handle, AVFrame *frame)
    ret = avcodec_send_frame(handle->video.codec, frame);
    if (ret < 0)
    {
-#ifdef __cplusplus
-      RARCH_ERR("[FFmpeg] Cannot send video frame. Error code: %d.\n", ret);
-#else
-      RARCH_ERR("[FFmpeg] Cannot send video frame. Error code: %s.\n", av_err2str(ret));
-#endif
+      char msg[AV_ERROR_MAX_STRING_SIZE];
+      av_make_error_string(msg, AV_ERROR_MAX_STRING_SIZE, ret);
+      RARCH_ERR("[FFmpeg] Cannot send video frame. Error code: %s.\n", msg);
       return false;
    }
 
@@ -1204,11 +1202,9 @@ static bool encode_video(ffmpeg_t *handle, AVFrame *frame)
          break;
       else if (ret < 0)
       {
-#ifdef __cplusplus
-         RARCH_ERR("[FFmpeg] Cannot receive video packet. Error code: %d.\n", ret);
-#else
-         RARCH_ERR("[FFmpeg] Cannot receive video packet. Error code: %s.\n", av_err2str(ret));
-#endif
+         char msg[AV_ERROR_MAX_STRING_SIZE];
+         av_make_error_string(msg, AV_ERROR_MAX_STRING_SIZE, ret);
+         RARCH_ERR("[FFmpeg] Cannot receive video packet. Error code: %s.\n", msg);
          return false;
       }
 
@@ -1225,11 +1221,9 @@ static bool encode_video(ffmpeg_t *handle, AVFrame *frame)
       ret = av_interleaved_write_frame(handle->muxer.ctx, pkt);
       if (ret < 0)
       {
-#ifdef __cplusplus
-         RARCH_ERR("[FFmpeg] Cannot write video packet to output file. Error code: %d.\n", ret);
-#else
-         RARCH_ERR("[FFmpeg] Cannot write video packet to output file. Error code: %s.\n", av_err2str(ret));
-#endif
+         char msg[AV_ERROR_MAX_STRING_SIZE];
+         av_make_error_string(msg, AV_ERROR_MAX_STRING_SIZE, ret);
+         RARCH_ERR("[FFmpeg] Cannot write video packet to output file. Error code: %s.\n", msg);
          return false;
       }
 
@@ -1386,12 +1380,11 @@ static bool encode_audio(ffmpeg_t *handle, bool dry)
    ret = avcodec_send_frame(handle->audio.codec, dry ? NULL : frame);
    if (ret < 0)
    {
+      char msg[AV_ERROR_MAX_STRING_SIZE];
+
       av_frame_free(&frame);
-#ifdef __cplusplus
-      RARCH_ERR("[FFmpeg] Cannot send audio frame. Return code: %d.\n", ret);
-#else
-      RARCH_ERR("[FFmpeg] Cannot send audio frame. Return code: %s.\n", av_err2str(ret));
-#endif
+      av_make_error_string(msg, AV_ERROR_MAX_STRING_SIZE, ret);
+      RARCH_ERR("[FFmpeg] Cannot send audio frame. Return code: %s.\n", msg);
       return false;
    }
 
@@ -1402,12 +1395,12 @@ static bool encode_audio(ffmpeg_t *handle, bool dry)
          break;
       else if (ret < 0)
       {
+         char msg[AV_ERROR_MAX_STRING_SIZE];
+
          av_frame_free(&frame);
-#ifdef __cplusplus
-         RARCH_ERR("[FFmpeg] Cannot receive audio packet. Return code: %d.\n", ret);
-#else
-         RARCH_ERR("[FFmpeg] Cannot receive audio packet. Return code: %s.\n", av_err2str(ret));
-#endif
+
+         av_make_error_string(msg, AV_ERROR_MAX_STRING_SIZE, ret);
+         RARCH_ERR("[FFmpeg] Cannot receive audio packet. Return code: %s.\n", msg);
          return false;
       }
 
@@ -1424,12 +1417,11 @@ static bool encode_audio(ffmpeg_t *handle, bool dry)
       ret = av_interleaved_write_frame(handle->muxer.ctx, pkt);
       if (ret < 0)
       {
+         char msg[AV_ERROR_MAX_STRING_SIZE];
+
          av_frame_free(&frame);
-#ifdef __cplusplus
-         RARCH_ERR("[FFmpeg] Cannot write video packet to output file. Error code: %d.\n", ret);
-#else
-         RARCH_ERR("[FFmpeg] Cannot write video packet to output file. Error code: %s.\n", av_err2str(ret));
-#endif
+         av_make_error_string(msg, AV_ERROR_MAX_STRING_SIZE, ret);
+         RARCH_ERR("[FFmpeg] Cannot write video packet to output file. Error code: %s.\n", msg);
          return false;
       }