summaryrefslogtreecommitdiff
path: root/avconv.c
diff options
context:
space:
mode:
authorVittorio Giovara <vittorio.giovara@gmail.com>2015-06-29 21:59:37 +0200
committerVittorio Giovara <vittorio.giovara@gmail.com>2015-07-27 15:24:58 +0100
commit7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615 (patch)
tree4613835d2ddad31bb5603827f28d8a4a6e4d9e21 /avconv.c
parent4b6b1082a73907c7c3de2646c6398bc61320f2c6 (diff)
lavc: AV-prefix all codec flags
Convert doxygen to multiline and express bitfields more simply. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Diffstat (limited to 'avconv.c')
-rw-r--r--avconv.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/avconv.c b/avconv.c
index 319823b056..c48d16777c 100644
--- a/avconv.c
+++ b/avconv.c
@@ -508,7 +508,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
} else {
int got_packet;
- if (enc->flags & (CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_INTERLACED_ME) &&
+ if (enc->flags & (AV_CODEC_FLAG_INTERLACED_DCT | AV_CODEC_FLAG_INTERLACED_ME) &&
ost->top_field_first >= 0)
in_picture->top_field_first = !!ost->top_field_first;
@@ -576,7 +576,7 @@ static void do_video_stats(OutputStream *ost, int frame_size)
#if FF_API_CODED_FRAME
FF_DISABLE_DEPRECATION_WARNINGS
- if (enc->flags&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)));
FF_ENABLE_DEPRECATION_WARNINGS
#endif
@@ -891,7 +891,7 @@ static void print_report(int is_last_report, int64_t timer_start)
#if FF_API_CODED_FRAME
FF_DISABLE_DEPRECATION_WARNINGS
- if (enc->flags&CODEC_FLAG_PSNR) {
+ if (enc->flags & AV_CODEC_FLAG_PSNR) {
int j;
double error, error_sum = 0;
double scale, scale_sum = 0;