diff options
| author | Jeongmo Yang <jm80.yang@samsung.com> | 2015-01-07 08:45:25 +0900 |
|---|---|---|
| committer | Jeongmo Yang <jm80.yang@samsung.com> | 2015-01-06 15:53:32 -0800 |
| commit | 54655a0a7b826f08ac536bd2552c7acda0f60598 (patch) | |
| tree | c653a4007e7c5b615aa2a800dba3a9b0af279967 | |
| parent | 11e7f8234a62ed196f56870432a9c5a101b75221 (diff) | |
| download | libmm-common-54655a0a7b826f08ac536bd2552c7acda0f60598.tar.gz libmm-common-54655a0a7b826f08ac536bd2552c7acda0f60598.tar.bz2 libmm-common-54655a0a7b826f08ac536bd2552c7acda0f60598.zip | |
Add new enum - MM_FILE_FORMAT_M2TS, MM_PIXEL_FORMAT_ENCODED_H264submit/tizen/20150107.065933
Change-Id: I75b1804f383f7b005baae195dc3f56b02440aaad
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
| -rw-r--r-- | include/mm_types.h | 4 | ||||
| -rw-r--r-- | packaging/libmm-common.spec | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/mm_types.h b/include/mm_types.h index 6cd6df1..322eb0d 100644 --- a/include/mm_types.h +++ b/include/mm_types.h @@ -349,6 +349,7 @@ enum MMFileFormatType { MM_FILE_FORMAT_WMV, /**< WMV file format */ MM_FILE_FORMAT_JPG, /**< JPEG file format */ MM_FILE_FORMAT_FLAC, /**< FLAC file format */ + MM_FILE_FORMAT_M2TS, /**< MPEG2-TransportStream file format */ MM_FILE_FORMAT_NUM, /**< Number of file format type */ }; @@ -379,8 +380,9 @@ typedef enum { MM_PIXEL_FORMAT_RGB888, /**< RGB888 pixel format */ MM_PIXEL_FORMAT_RGBA, /**< RGBA pixel format */ MM_PIXEL_FORMAT_ARGB, /**< ARGB pixel format */ - MM_PIXEL_FORMAT_ENCODED, /**< Encoded pixel format */ + MM_PIXEL_FORMAT_ENCODED, /**< Encoded pixel format : JPEG */ MM_PIXEL_FORMAT_ITLV_JPEG_UYVY, /**< FIXME: JPEG+UYVY Interleaved format */ + MM_PIXEL_FORMAT_ENCODED_H264, /**< Encoded pixel format : H.264 */ MM_PIXEL_FORMAT_NUM /**< Number of the pixel format */ } MMPixelFormatType; diff --git a/packaging/libmm-common.spec b/packaging/libmm-common.spec index b7e10d6..9b4b888 100644 --- a/packaging/libmm-common.spec +++ b/packaging/libmm-common.spec @@ -1,6 +1,6 @@ Name: libmm-common Summary: Multimedia Framework Common Lib -Version: 0.2.84 +Version: 0.2.85 Release: 0 Group: TO_BE/FILLED_IN License: Apache-2.0 |