aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2013-07-28 13:26:12 +0200
committerSean McGovern <gseanmcg@gmail.com>2013-09-23 19:45:05 -0400
commit3dff283de11ad52ddae3246fe7594526ebb62d04 (patch)
treea22908faa3d1354b7880a0b9bcde329b835d1ae7
parent86c169c5b691ac8434056936a7690fc4c64b4b1a (diff)
downloadffmpeg-3dff283de11ad52ddae3246fe7594526ebb62d04.tar.gz
ac3: Do not clash with normal AVERROR
The parsing function return AVERROR and AAC_AC3_PARSE_ERROR values, make sure they are not misunderstood. (cherry picked from commit 6258d362b82934a2c27557e0984aed372d98091a) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
-rw-r--r--libavcodec/aac_ac3_parser.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/aac_ac3_parser.h b/libavcodec/aac_ac3_parser.h
index a14fce5190..7b21460acd 100644
--- a/libavcodec/aac_ac3_parser.h
+++ b/libavcodec/aac_ac3_parser.h
@@ -28,13 +28,13 @@
#include "parser.h"
typedef enum {
- AAC_AC3_PARSE_ERROR_SYNC = -1,
- AAC_AC3_PARSE_ERROR_BSID = -2,
- AAC_AC3_PARSE_ERROR_SAMPLE_RATE = -3,
- AAC_AC3_PARSE_ERROR_FRAME_SIZE = -4,
- AAC_AC3_PARSE_ERROR_FRAME_TYPE = -5,
- AAC_AC3_PARSE_ERROR_CRC = -6,
- AAC_AC3_PARSE_ERROR_CHANNEL_CFG = -7,
+ AAC_AC3_PARSE_ERROR_SYNC = -0x1030c0a,
+ AAC_AC3_PARSE_ERROR_BSID = -0x2030c0a,
+ AAC_AC3_PARSE_ERROR_SAMPLE_RATE = -0x3030c0a,
+ AAC_AC3_PARSE_ERROR_FRAME_SIZE = -0x4030c0a,
+ AAC_AC3_PARSE_ERROR_FRAME_TYPE = -0x5030c0a,
+ AAC_AC3_PARSE_ERROR_CRC = -0x6030c0a,
+ AAC_AC3_PARSE_ERROR_CHANNEL_CFG = -0x7030c0a,
} AACAC3ParseError;
typedef struct AACAC3ParseContext {