summaryrefslogtreecommitdiff
path: root/libavcodec/eac3dec.c
diff options
context:
space:
mode:
authorAlex Converse <alex.converse@gmail.com>2009-01-07 18:10:10 +0000
committerRobert Swain <robert.swain@gmail.com>2009-01-07 18:10:10 +0000
commit11d6f38cc997d70f687a3546af896b76b447ce0d (patch)
tree73cddb91070c9d29201c425fc4dec2787fb1ad3e /libavcodec/eac3dec.c
parent4b82e3cedcfc9871671bb613cd979de6995dcb4e (diff)
downloadffmpeg-11d6f38cc997d70f687a3546af896b76b447ce0d.tar.gz
Factorise enum of AC3 error types to be usable by AAC in the ADTS patch that
will follow Patch by Alex Converse ( alex converse gmail com ) Originally committed as revision 16479 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/eac3dec.c')
-rw-r--r--libavcodec/eac3dec.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/eac3dec.c b/libavcodec/eac3dec.c
index bae4d15838..f57c1cc617 100644
--- a/libavcodec/eac3dec.c
+++ b/libavcodec/eac3dec.c
@@ -22,6 +22,7 @@
#include "avcodec.h"
#include "internal.h"
+#include "aac_ac3_parser.h"
#include "ac3.h"
#include "ac3_parser.h"
#include "ac3dec.h"
@@ -184,10 +185,10 @@ int ff_eac3_parse_header(AC3DecodeContext *s)
dependent streams which are used to add or replace channels. */
if (s->frame_type == EAC3_FRAME_TYPE_DEPENDENT) {
ff_log_missing_feature(s->avctx, "Dependent substream decoding", 1);
- return AC3_PARSE_ERROR_FRAME_TYPE;
+ return AAC_AC3_PARSE_ERROR_FRAME_TYPE;
} else if (s->frame_type == EAC3_FRAME_TYPE_RESERVED) {
av_log(s->avctx, AV_LOG_ERROR, "Reserved frame type\n");
- return AC3_PARSE_ERROR_FRAME_TYPE;
+ return AAC_AC3_PARSE_ERROR_FRAME_TYPE;
}
/* The substream id indicates which substream this frame belongs to. each
@@ -196,7 +197,7 @@ int ff_eac3_parse_header(AC3DecodeContext *s)
if (s->substreamid) {
/* only decode substream with id=0. skip any additional substreams. */
ff_log_missing_feature(s->avctx, "Additional substreams", 1);
- return AC3_PARSE_ERROR_FRAME_TYPE;
+ return AAC_AC3_PARSE_ERROR_FRAME_TYPE;
}
if (s->bit_alloc_params.sr_code == EAC3_SR_CODE_REDUCED) {