roqaudioenc: return AVERROR codes instead of -1

[ffmpeg] / libavcodec / mpeg12data.h

diff --git a/libavcodec/mpeg12data.h b/libavcodec/mpeg12data.h
index 9793604725f97928482540d2923d814649c1d40a..86ba3ec15fc7f0b42293bbec59462ffe0318c339 100644 (file)
--- a/libavcodec/mpeg12data.h
+++ b/libavcodec/mpeg12data.h
@@ -3,25 +3,25 @@
  * copyright (c) 2000,2001 Fabrice Bellard
  * copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
  *
- * 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
  */
 
 /**
- * @file mpeg12data.h
+ * @file
  * MPEG1/2 tables.
  */
 
@@ -29,7 +29,11 @@
 #define AVCODEC_MPEG12DATA_H
 
 #include <stdint.h>
-#include "mpegvideo.h"
+#include "libavutil/rational.h"
+#include "rl.h"
+
+extern const uint16_t ff_mpeg1_default_intra_matrix[64];
+extern const uint16_t ff_mpeg1_default_non_intra_matrix[64];
 
 extern const uint16_t ff_mpeg12_vlc_dc_lum_code[12];
 extern const unsigned char ff_mpeg12_vlc_dc_lum_bits[12];
@@ -44,7 +48,9 @@ extern const uint8_t ff_mpeg12_mbPatTable[64][2];
 
 extern const uint8_t ff_mpeg12_mbMotionVectorTable[17][2];
 
+extern const AVRational avpriv_frame_rate_tab[];
+
 extern const float ff_mpeg1_aspect[16];
 extern const AVRational ff_mpeg2_aspect[16];
 
-#endif // AVCODEC_MPEG12DATA_H
+#endif /* AVCODEC_MPEG12DATA_H */