diff options
| author | Andrew Mahone <andrew.mahone@gmail.com> | 2009-11-20 11:58:11 +0000 |
|---|---|---|
| committer | Andrew Mahone <andrew.mahone@gmail.com> | 2009-11-20 11:58:11 +0000 |
| commit | e0b020fbfcadfbd4fbcb3ae7b5b5ea53992b404b (patch) | |
| tree | a8079b5561185219714842ff4af48f34ec9135be /apps/plugins/mpegplayer/mpeg2.h | |
| parent | 475e68851de5fe097d5436a9e4f1063c79d4a1a6 (diff) | |
| download | rockbox-e0b020fbfcadfbd4fbcb3ae7b5b5ea53992b404b.zip rockbox-e0b020fbfcadfbd4fbcb3ae7b5b5ea53992b404b.tar.gz rockbox-e0b020fbfcadfbd4fbcb3ae7b5b5ea53992b404b.tar.bz2 rockbox-e0b020fbfcadfbd4fbcb3ae7b5b5ea53992b404b.tar.xz | |
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
Diffstat (limited to 'apps/plugins/mpegplayer/mpeg2.h')
| -rw-r--r-- | apps/plugins/mpegplayer/mpeg2.h | 10 |
1 files changed, 9 insertions, 1 deletions
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); |