Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / aacadtsdec.h

diff --git a/libavcodec/aacadtsdec.h b/libavcodec/aacadtsdec.h
index 6e0a869cc5dc76311f51afcacf1405ed74e89950..fb2cbd9b35df1ac46abf6c992d0d2ec0682985c2 100644 (file)
--- a/libavcodec/aacadtsdec.h
+++ b/libavcodec/aacadtsdec.h
@@ -49,6 +49,6 @@ typedef struct {
  * -2 if the version element is invalid, -3 if the sample rate
  * element is invalid, or -4 if the bit rate element is invalid.
  */
-int ff_aac_parse_header(GetBitContext *gbc, AACADTSHeaderInfo *hdr);
+int avpriv_aac_parse_header(GetBitContext *gbc, AACADTSHeaderInfo *hdr);
 
 #endif /* AVCODEC_AACADTSDEC_H */