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

avconv: Use more precise deprecation ifdefs

Browse Source 
This fixes compilation with the libavcodec version bumped to 58.
This commit is contained in:
Diego Biurrun
2016-05-21 13:49:46 +02:00
parent 35c8580668
commit e2a3df1a46
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
avconv.c
View File

@@ -570,7 +570,7 @@ error:
exit_program(1); exit_program(1);
} }
#if FF_API_CODED_FRAME #if FF_API_CODED_FRAME && FF_API_ERROR_FRAME
static double psnr(double d) static double psnr(double d)
{ {
return -10.0 * log(d) / log(10.0); return -10.0 * log(d) / log(10.0);
@@ -598,7 +598,7 @@ static void do_video_stats(OutputStream *ost, int frame_size)
fprintf(vstats_file, "frame= %5d q= %2.1f ", frame_number, fprintf(vstats_file, "frame= %5d q= %2.1f ", frame_number,
ost->quality / (float)FF_QP2LAMBDA); ost->quality / (float)FF_QP2LAMBDA);
#if FF_API_CODED_FRAME #if FF_API_CODED_FRAME && FF_API_ERROR_FRAME
FF_DISABLE_DEPRECATION_WARNINGS FF_DISABLE_DEPRECATION_WARNINGS
if (enc->flags & AV_CODEC_FLAG_PSNR) if (enc->flags & AV_CODEC_FLAG_PSNR)
fprintf(vstats_file, "PSNR= %6.2f ", psnr(enc->coded_frame->error[0] / (enc->width * enc->height * 255.0 * 255.0))); fprintf(vstats_file, "PSNR= %6.2f ", psnr(enc->coded_frame->error[0] / (enc->width * enc->height * 255.0 * 255.0)));
@@ -913,7 +913,7 @@ static void print_report(int is_last_report, int64_t timer_start)
snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "%X", (int)lrintf(log2(qp_histogram[j] + 1))); snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "%X", (int)lrintf(log2(qp_histogram[j] + 1)));
} }
#if FF_API_CODED_FRAME #if FF_API_CODED_FRAME && FF_API_ERROR_FRAME
FF_DISABLE_DEPRECATION_WARNINGS FF_DISABLE_DEPRECATION_WARNINGS
if (enc->flags & AV_CODEC_FLAG_PSNR) { if (enc->flags & AV_CODEC_FLAG_PSNR) {
int j; int j;