From f9ceeeb09fd9b4f597858fc8f30099bd95dade92 Mon Sep 17 00:00:00 2001 From: TangoCash Date: Sun, 24 Jul 2016 17:14:43 +0200 Subject: [PATCH] add support for H265 Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/0bed01e91950716100b3f06a0b8ba7b3ae6ebd01 Author: TangoCash Date: 2016-07-24 (Sun, 24 Jul 2016) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- generic-pc/video_lib.h | 7 ++++--- libspark/video_lib.h | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/generic-pc/video_lib.h b/generic-pc/video_lib.h index fcff69a..3b075d4 100644 --- a/generic-pc/video_lib.h +++ b/generic-pc/video_lib.h @@ -23,14 +23,15 @@ typedef enum { ANALOG_SCART_MASK = 0x10 } analog_mode_t; - typedef enum { VIDEO_FORMAT_MPEG2 = 0, - VIDEO_FORMAT_MPEG4, + VIDEO_FORMAT_MPEG4_H264, VIDEO_FORMAT_VC1, VIDEO_FORMAT_JPEG, VIDEO_FORMAT_GIF, - VIDEO_FORMAT_PNG + VIDEO_FORMAT_PNG, + VIDEO_FORMAT_MPEG4_H265, + VIDEO_FORMAT_AVS = 16 } VIDEO_FORMAT; typedef enum { diff --git a/libspark/video_lib.h b/libspark/video_lib.h index 62c2d1e..139333d 100644 --- a/libspark/video_lib.h +++ b/libspark/video_lib.h @@ -27,14 +27,15 @@ typedef enum { COLORFORMAT_HDMI_YCBCR422 } COLOR_FORMAT; - typedef enum { VIDEO_FORMAT_MPEG2 = 0, - VIDEO_FORMAT_MPEG4, + VIDEO_FORMAT_MPEG4_H264, VIDEO_FORMAT_VC1, VIDEO_FORMAT_JPEG, VIDEO_FORMAT_GIF, - VIDEO_FORMAT_PNG + VIDEO_FORMAT_PNG, + VIDEO_FORMAT_MPEG4_H265, + VIDEO_FORMAT_AVS = 16 } VIDEO_FORMAT; typedef enum {