[FFmpeg-cvslog] avcodec/h264_sei: add namespace prefix to frame packingarrangement enum values
James Almer
git at videolan.org
Wed Sep 13 02:07:44 EEST 2017
ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Tue Sep 12 19:59:23 2017 -0300| [9669c05baf37025f6fa038dc6b00b45f9c57de90] | committer: James Almer
avcodec/h264_sei: add namespace prefix to frame packingarrangement enum values
Missed in 6eb102a616364d06a4cc994339b72910b3547e5f.
Signed-off-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9669c05baf37025f6fa038dc6b00b45f9c57de90
---
libavcodec/h264_sei.c | 14 +++++++-------
libavcodec/h264_sei.h | 18 +++++++++---------
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/libavcodec/h264_sei.c b/libavcodec/h264_sei.c
index 2afe48e2fe..332ae50860 100644
--- a/libavcodec/h264_sei.c
+++ b/libavcodec/h264_sei.c
@@ -469,37 +469,37 @@ const char *ff_h264_sei_stereo_mode(const H264SEIFramePacking *h)
{
if (h->frame_packing_arrangement_cancel_flag == 0) {
switch (h->frame_packing_arrangement_type) {
- case SEI_FPA_TYPE_CHECKERBOARD:
+ case H264_SEI_FPA_TYPE_CHECKERBOARD:
if (h->content_interpretation_type == 2)
return "checkerboard_rl";
else
return "checkerboard_lr";
- case SEI_FPA_TYPE_INTERLEAVE_COLUMN:
+ case H264_SEI_FPA_TYPE_INTERLEAVE_COLUMN:
if (h->content_interpretation_type == 2)
return "col_interleaved_rl";
else
return "col_interleaved_lr";
- case SEI_FPA_TYPE_INTERLEAVE_ROW:
+ case H264_SEI_FPA_TYPE_INTERLEAVE_ROW:
if (h->content_interpretation_type == 2)
return "row_interleaved_rl";
else
return "row_interleaved_lr";
- case SEI_FPA_TYPE_SIDE_BY_SIDE:
+ case H264_SEI_FPA_TYPE_SIDE_BY_SIDE:
if (h->content_interpretation_type == 2)
return "right_left";
else
return "left_right";
- case SEI_FPA_TYPE_TOP_BOTTOM:
+ case H264_SEI_FPA_TYPE_TOP_BOTTOM:
if (h->content_interpretation_type == 2)
return "bottom_top";
else
return "top_bottom";
- case SEI_FPA_TYPE_INTERLEAVE_TEMPORAL:
+ case H264_SEI_FPA_TYPE_INTERLEAVE_TEMPORAL:
if (h->content_interpretation_type == 2)
return "block_rl";
else
return "block_lr";
- case SEI_FPA_TYPE_2D:
+ case H264_SEI_FPA_TYPE_2D:
default:
return "mono";
}
diff --git a/libavcodec/h264_sei.h b/libavcodec/h264_sei.h
index 8cad5ea997..a53f1899fa 100644
--- a/libavcodec/h264_sei.h
+++ b/libavcodec/h264_sei.h
@@ -56,14 +56,14 @@ typedef enum {
* frame_packing_arrangement types
*/
typedef enum {
- SEI_FPA_TYPE_CHECKERBOARD = 0,
- SEI_FPA_TYPE_INTERLEAVE_COLUMN = 1,
- SEI_FPA_TYPE_INTERLEAVE_ROW = 2,
- SEI_FPA_TYPE_SIDE_BY_SIDE = 3,
- SEI_FPA_TYPE_TOP_BOTTOM = 4,
- SEI_FPA_TYPE_INTERLEAVE_TEMPORAL = 5,
- SEI_FPA_TYPE_2D = 6,
-} SEI_FpaType;
+ H264_SEI_FPA_TYPE_CHECKERBOARD = 0,
+ H264_SEI_FPA_TYPE_INTERLEAVE_COLUMN = 1,
+ H264_SEI_FPA_TYPE_INTERLEAVE_ROW = 2,
+ H264_SEI_FPA_TYPE_SIDE_BY_SIDE = 3,
+ H264_SEI_FPA_TYPE_TOP_BOTTOM = 4,
+ H264_SEI_FPA_TYPE_INTERLEAVE_TEMPORAL = 5,
+ H264_SEI_FPA_TYPE_2D = 6,
+} H264_SEI_FpaType;
typedef struct H264SEIPictureTiming {
int present;
@@ -121,7 +121,7 @@ typedef struct H264SEIFramePacking {
int present;
int frame_packing_arrangement_id;
int frame_packing_arrangement_cancel_flag; ///< is previous arrangement canceled, -1 if never received
- SEI_FpaType frame_packing_arrangement_type;
+ H264_SEI_FpaType frame_packing_arrangement_type;
int frame_packing_arrangement_repetition_period;
int content_interpretation_type;
int quincunx_sampling_flag;
More information about the ffmpeg-cvslog
mailing list