diff options
| author | Steve Kondik <shade@chemlab.org> | 2016-08-19 22:52:05 -0700 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2016-08-19 22:52:18 -0700 |
| commit | 0a27fb6d73b5e644ff9ea7099afbbdfc6c69e23a (patch) | |
| tree | c9dc4a2f160e90254083ac1e83cc269dbe19ad4d | |
| parent | b0f585937b1aca650b5997d9a1fc67513a0704f9 (diff) | |
| download | android_external_ffmpeg-0a27fb6d73b5e644ff9ea7099afbbdfc6c69e23a.tar.gz android_external_ffmpeg-0a27fb6d73b5e644ff9ea7099afbbdfc6c69e23a.tar.bz2 android_external_ffmpeg-0a27fb6d73b5e644ff9ea7099afbbdfc6c69e23a.zip | |
Revert "ffmpeg: Additional APE extradata"
This reverts commit 5934ab8cf4e7b8d3b38f9793adf7c0d54ac4331c.
Change-Id: I6d0947a13f6b143fcfdef5c883b9b4881961485a
| -rw-r--r-- | libavcodec/apedec.c | 2 | ||||
| -rw-r--r-- | libavformat/ape.c | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c index 9de0c11a0c..de9d71ca40 100644 --- a/libavcodec/apedec.c +++ b/libavcodec/apedec.c @@ -217,7 +217,7 @@ static av_cold int ape_decode_init(AVCodecContext *avctx) APEContext *s = avctx->priv_data; int i; - if (avctx->extradata_size != 24) { + if (avctx->extradata_size != 6) { av_log(avctx, AV_LOG_ERROR, "Incorrect extradata\n"); return AVERROR(EINVAL); } diff --git a/libavformat/ape.c b/libavformat/ape.c index 48d9735be2..3e819728cc 100644 --- a/libavformat/ape.c +++ b/libavformat/ape.c @@ -38,7 +38,7 @@ #define MAC_FORMAT_FLAG_HAS_SEEK_ELEMENTS 16 // has the number of seek elements after the peak level #define MAC_FORMAT_FLAG_CREATE_WAV_HEADER 32 // create the wave header on decompression (not stored) -#define APE_EXTRADATA_SIZE 24 +#define APE_EXTRADATA_SIZE 6 typedef struct APEFrame { int64_t pos; @@ -365,10 +365,6 @@ static int ape_read_header(AVFormatContext * s) AV_WL16(st->codec->extradata + 0, ape->fileversion); AV_WL16(st->codec->extradata + 2, ape->compressiontype); AV_WL16(st->codec->extradata + 4, ape->formatflags); - AV_WL32(st->codec->extradata + 8, ape->blocksperframe); - AV_WL32(st->codec->extradata + 12, ape->finalframeblocks); - AV_WL32(st->codec->extradata + 16, ape->totalframes); - AV_WL32(st->codec->extradata + 20, ape->seektable ? 1 : 0); pts = 0; for (i = 0; i < ape->totalframes; i++) { |