From e0b020fbfcadfbd4fbcb3ae7b5b5ea53992b404b Mon Sep 17 00:00:00 2001
From: Andrew Mahone <andrew.mahone@gmail.com>
Date: Fri, 20 Nov 2009 11:58:11 +0000
Subject: Merge mpeg_malloc_reason_t and mpeg2_alloc_t, add
 STATE_INTERNAL_NORETURN to mpeg2_state_t, to fix warnings with short enums.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23677 a1c6a512-1295-4272-9138-f99709370657
---
 apps/plugins/mpegplayer/mpeg2.h | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'apps/plugins/mpegplayer/mpeg2.h')

diff --git a/apps/plugins/mpegplayer/mpeg2.h b/apps/plugins/mpegplayer/mpeg2.h
index 2a63f39..bd14ead 100644
--- a/apps/plugins/mpegplayer/mpeg2.h
+++ b/apps/plugins/mpegplayer/mpeg2.h
@@ -130,6 +130,7 @@ typedef struct mpeg2_decoder_s mpeg2_decoder_t;
 
 typedef enum
 {
+    STATE_INTERNAL_NORETURN = -1,
     STATE_BUFFER            = 0,
     STATE_SEQUENCE          = 1,
     STATE_SEQUENCE_REPEATED = 2,
@@ -199,7 +200,14 @@ typedef enum
     MPEG2_ALLOC_CHUNK      = 1,
     MPEG2_ALLOC_YUV        = 2,
     MPEG2_ALLOC_CONVERT_ID = 3,
-    MPEG2_ALLOC_CONVERTED  = 4
+    MPEG2_ALLOC_CONVERTED  = 4,
+    MPEG_ALLOC_CODEC_MALLOC,
+    MPEG_ALLOC_CODEC_CALLOC,
+    MPEG_ALLOC_MPEG2_BUFFER,
+    MPEG_ALLOC_AUDIOBUF,
+    MPEG_ALLOC_PCMOUT,
+    MPEG_ALLOC_DISKBUF,
+    __MPEG_ALLOC_FIRST = -256,
 } mpeg2_alloc_t;
 
 void * mpeg2_malloc (unsigned size, mpeg2_alloc_t reason);
-- 
cgit v1.1