[FFmpeg-cvslog] ac3: Do not clash with normal AVERROR
Luca Barbato
git at videolan.org
Wed Aug 28 13:39:46 CEST 2013
ffmpeg | branch: release/1.1 | Luca Barbato <lu_zero at gentoo.org> | Sun Jul 28 13:26:12 2013 +0200| [07bfb254c6c7fb5fafd0647ccdf8630a17ddc7e4] | committer: Luca Barbato
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 at gentoo.org>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=07bfb254c6c7fb5fafd0647ccdf8630a17ddc7e4
---
libavcodec/aac_ac3_parser.h | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/libavcodec/aac_ac3_parser.h b/libavcodec/aac_ac3_parser.h
index 90b49c5..99286f0 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 {
More information about the ffmpeg-cvslog
mailing list