Commit f0ee0341 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '6258d362'

* commit '6258d362':
  ac3: Do not clash with normal AVERROR
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 946902e5 6258d362
...@@ -28,13 +28,13 @@ ...@@ -28,13 +28,13 @@
#include "parser.h" #include "parser.h"
typedef enum { typedef enum {
AAC_AC3_PARSE_ERROR_SYNC = -1, AAC_AC3_PARSE_ERROR_SYNC = -0x1030c0a,
AAC_AC3_PARSE_ERROR_BSID = -2, AAC_AC3_PARSE_ERROR_BSID = -0x2030c0a,
AAC_AC3_PARSE_ERROR_SAMPLE_RATE = -3, AAC_AC3_PARSE_ERROR_SAMPLE_RATE = -0x3030c0a,
AAC_AC3_PARSE_ERROR_FRAME_SIZE = -4, AAC_AC3_PARSE_ERROR_FRAME_SIZE = -0x4030c0a,
AAC_AC3_PARSE_ERROR_FRAME_TYPE = -5, AAC_AC3_PARSE_ERROR_FRAME_TYPE = -0x5030c0a,
AAC_AC3_PARSE_ERROR_CRC = -6, AAC_AC3_PARSE_ERROR_CRC = -0x6030c0a,
AAC_AC3_PARSE_ERROR_CHANNEL_CFG = -7, AAC_AC3_PARSE_ERROR_CHANNEL_CFG = -0x7030c0a,
} AACAC3ParseError; } AACAC3ParseError;
typedef struct AACAC3ParseContext { typedef struct AACAC3ParseContext {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment