[FFmpeg-cvslog] avcodec: remove unused avpriv_ac3_parse_header

Andreas Cadhalpun git at videolan.org
Wed Oct 21 00:32:16 CEST 2015


ffmpeg | branch: master | Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com> | Wed Oct 14 01:42:06 2015 +0200| [3dfb643cd40790629859e99d44bf888e41e58122] | committer: Andreas Cadhalpun

avcodec: remove unused avpriv_ac3_parse_header

It was replaced by avpriv_ac3_parse_header2.

Reviewed-by: Michael Niedermayer <michael at niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3dfb643cd40790629859e99d44bf888e41e58122
---

 libavcodec/ac3_parser.c |    9 ---------
 libavcodec/ac3_parser.h |    2 --
 2 files changed, 11 deletions(-)

diff --git a/libavcodec/ac3_parser.c b/libavcodec/ac3_parser.c
index 5ab5627..0dd98b9 100644
--- a/libavcodec/ac3_parser.c
+++ b/libavcodec/ac3_parser.c
@@ -151,15 +151,6 @@ int avpriv_ac3_parse_header2(GetBitContext *gbc, AC3HeaderInfo **phdr)
     return 0;
 }
 
-int avpriv_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo *hdr)
-{
-    AC3HeaderInfo tmp, *ptmp = &tmp;
-    int ret = avpriv_ac3_parse_header2(gbc, &ptmp);
-
-    memcpy(hdr, ptmp, ((intptr_t)&tmp.channel_layout) - ((intptr_t)&tmp) + sizeof(uint64_t));
-    return ret;
-}
-
 static int ac3_sync(uint64_t state, AACAC3ParseContext *hdr_info,
         int *need_next_header, int *new_frame_start)
 {
diff --git a/libavcodec/ac3_parser.h b/libavcodec/ac3_parser.h
index f37387d..80bc5ef 100644
--- a/libavcodec/ac3_parser.h
+++ b/libavcodec/ac3_parser.h
@@ -39,6 +39,4 @@
  */
 int avpriv_ac3_parse_header2(GetBitContext *gbc, AC3HeaderInfo **hdr);
 
-int avpriv_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo *hdr);
-
 #endif /* AVCODEC_AC3_PARSER_H */



More information about the ffmpeg-cvslog mailing list