qpeg: use reget_buffer() in decode_frame()

[ffmpeg] / libavcodec / aacpsy.h

diff --git a/libavcodec/aacpsy.h b/libavcodec/aacpsy.h
index d0dbb078e9af7d3bb19ea44222a6bddaf4cec050..5d1e14220c130a54980e9d27321a49a4c8e97027 100644 (file)
--- a/libavcodec/aacpsy.h
+++ b/libavcodec/aacpsy.h
@@ -2,29 +2,29 @@
  * AAC encoder psychoacoustic model
  * Copyright (C) 2008 Konstantin Shishkov
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_AACPSY_H
-#define FFMPEG_AACPSY_H
+#ifndef AVCODEC_AACPSY_H
+#define AVCODEC_AACPSY_H
 
 #include "avcodec.h"
 #include "aac.h"
-#include "lowpass.h"
+//#include "lowpass.h"
 
 enum AACPsyModelType{
     AAC_PSY_TEST,              ///< a sample model to exercise encoder
@@ -47,4 +47,4 @@ typedef struct AACPsyContext {
  */
 void ff_aac_psy_end(AACPsyContext *ctx);
 
-#endif /* FFMPEG_AACPSY_H */
+#endif /* AVCODEC_AACPSY_H */