diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-07-07 02:06:48 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-07-07 02:07:11 +0300 |
commit | 6d908205fbadbdf7ccdc6c5e0eb918f0b43f16e0 (patch) | |
tree | 09a6acada909bd5d070ace54209cadeae66d15cf /libmpdemux/yuv4mpeg.h | |
parent | e306174952d42e1cd6cc5efc50ae6bb0410501bc (diff) | |
parent | eafe5b7517bbf408ae1ffc936a3abe2313c3b334 (diff) | |
download | mpv-6d908205fbadbdf7ccdc6c5e0eb918f0b43f16e0.tar.bz2 mpv-6d908205fbadbdf7ccdc6c5e0eb918f0b43f16e0.tar.xz |
Merge svn changes up to r29304
Diffstat (limited to 'libmpdemux/yuv4mpeg.h')
-rw-r--r-- | libmpdemux/yuv4mpeg.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libmpdemux/yuv4mpeg.h b/libmpdemux/yuv4mpeg.h index 87b71140ea..fd4dba805a 100644 --- a/libmpdemux/yuv4mpeg.h +++ b/libmpdemux/yuv4mpeg.h @@ -77,7 +77,7 @@ extern const y4m_ratio_t y4m_fps_60; /* 60fps */ /************************************************************************ * useful standard sample (pixel) aspect ratios ************************************************************************/ -extern const y4m_ratio_t y4m_sar_UNKNOWN; +extern const y4m_ratio_t y4m_sar_UNKNOWN; extern const y4m_ratio_t y4m_sar_SQUARE; /* square pixels */ extern const y4m_ratio_t y4m_sar_NTSC_CCIR601; /* 525-line (NTSC) Rec.601 */ extern const y4m_ratio_t y4m_sar_NTSC_16_9; /* 16:9 NTSC/Rec.601 */ @@ -202,12 +202,12 @@ const char *y4m_xtag_get(const y4m_xtag_list_t *xtags, int n); Y4M_ERR_XXTAGS - list is already full */ int y4m_xtag_add(y4m_xtag_list_t *xtags, const char *tag); -/* remove a tag from an xtag_list +/* remove a tag from an xtag_list returns: Y4M_OK - success Y4M_ERR_RANGE - n is out of range */ int y4m_xtag_remove(y4m_xtag_list_t *xtags, int n); -/* remove all tags from an xtag_list +/* remove all tags from an xtag_list returns: Y4M_OK - success */ int y4m_xtag_clearlist(y4m_xtag_list_t *xtags); @@ -294,7 +294,7 @@ ssize_t y4m_write(int fd, char *buf, size_t len); /************************************************************************ * stream header processing functions - * + * * o return values: * Y4M_OK - success * Y4M_ERR_* - error (see y4m_strerr() for descriptions) @@ -315,7 +315,7 @@ int y4m_write_stream_header(int fd, y4m_stream_info_t *i); /************************************************************************ * frame processing functions - * + * * o return values: * Y4M_OK - success * Y4M_ERR_* - error (see y4m_strerr() for descriptions) @@ -332,13 +332,13 @@ int y4m_write_frame_header(int fd, y4m_frame_info_t *i); /* read a complete frame (header + data) o yuv[3] points to three buffers, one each for Y, U, V planes */ -int y4m_read_frame(stream_t *s, y4m_stream_info_t *si, +int y4m_read_frame(stream_t *s, y4m_stream_info_t *si, y4m_frame_info_t *fi, unsigned char *yuv[3]); #if 0 /* write a complete frame (header + data) o yuv[3] points to three buffers, one each for Y, U, V planes */ -int y4m_write_frame(int fd, y4m_stream_info_t *si, +int y4m_write_frame(int fd, y4m_stream_info_t *si, y4m_frame_info_t *fi, unsigned char *yuv[3]); #endif @@ -349,7 +349,7 @@ int y4m_write_frame(int fd, y4m_stream_info_t *si, o lower_field[3] same as yuv[3] above, but for lower field */ int y4m_read_fields(int fd, y4m_stream_info_t *si, y4m_frame_info_t *fi, - unsigned char *upper_field[3], + unsigned char *upper_field[3], unsigned char *lower_field[3]); /* write a complete frame (header + data), but interleave fields @@ -358,7 +358,7 @@ int y4m_read_fields(int fd, y4m_stream_info_t *si, y4m_frame_info_t *fi, o lower_field[3] same as yuv[3] above, but for lower field */ int y4m_write_fields(int fd, y4m_stream_info_t *si, y4m_frame_info_t *fi, - unsigned char *upper_field[3], + unsigned char *upper_field[3], unsigned char *lower_field[3]); #endif |