From 5260b39e5fd632858f98aed250427633307a64ad Mon Sep 17 00:00:00 2001 From: Dmitry Kovalev Date: Tue, 28 Jan 2014 11:12:58 -0800 Subject: vpxdec: restoring old md5 behavior for y4m files. Fix of https://code.google.com/p/webm/issues/detail?id=698 issue. Change-Id: I7a92d91481dbbae28d8953f146e9faafdcd7a310 --- y4menc.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) (limited to 'y4menc.c') diff --git a/y4menc.c b/y4menc.c index 8321b432e..8b1c95e2b 100644 --- a/y4menc.c +++ b/y4menc.c @@ -10,21 +10,18 @@ #include "./y4menc.h" -void y4m_write_file_header(FILE *file, int width, int height, - const struct VpxRational *framerate, - vpx_img_fmt_t fmt) { - const char *color = fmt == VPX_IMG_FMT_444A ? "C444alpha\n" : - fmt == VPX_IMG_FMT_I444 ? "C444\n" : - fmt == VPX_IMG_FMT_I422 ? "C422\n" : - "C420jpeg\n"; +int y4m_write_file_header(char *buf, size_t len, int width, int height, + const struct VpxRational *framerate, + vpx_img_fmt_t fmt) { + const char *const color = fmt == VPX_IMG_FMT_444A ? "C444alpha\n" : + fmt == VPX_IMG_FMT_I444 ? "C444\n" : + fmt == VPX_IMG_FMT_I422 ? "C422\n" : + "C420jpeg\n"; - // Note: We can't output an aspect ratio here because IVF doesn't - // store one, and neither does VP8. - // That will have to wait until these tools support WebM natively.*/ - fprintf(file, "YUV4MPEG2 W%u H%u F%u:%u I%c %s", width, height, - framerate->numerator, framerate->denominator, 'p', color); + return snprintf(buf, len, "YUV4MPEG2 W%u H%u F%u:%u I%c %s", width, height, + framerate->numerator, framerate->denominator, 'p', color); } -void y4m_write_frame_header(FILE *file) { - fprintf(file, "FRAME\n"); +int y4m_write_frame_header(char *buf, size_t len) { + return snprintf(buf, len, "FRAME\n"); } -- cgit v1.2.3