mpeg4videoenc: Remove disabled variant of mpeg4_encode_block().

[ffmpeg] / libavcodec / dnxhddata.h

diff --git a/libavcodec/dnxhddata.h b/libavcodec/dnxhddata.h
index 7bcf96d0562a766a5990e353602c200b94ba8c34..df841872fc147f3479f08c012994db09fdbca39a 100644 (file)
--- a/libavcodec/dnxhddata.h
+++ b/libavcodec/dnxhddata.h
@@ -1,21 +1,21 @@
 /*
  * VC3/DNxHD decoder.
- * Copyright (c) 2007 SmartJog S.A., Baptiste Coudurier <baptiste dot coudurier at smartjog dot com>.
+ * Copyright (c) 2007 SmartJog S.A., Baptiste Coudurier <baptiste dot coudurier at smartjog dot com>
  *
- * 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
  */
 
@@ -23,6 +23,7 @@
 #define AVCODEC_DNXHDDATA_H
 
 #include <stdint.h>
+#include "avcodec.h"
 
 typedef struct {
     int cid;
@@ -39,10 +40,12 @@ typedef struct {
     const uint8_t *ac_run_flag, *ac_index_flag;
     const uint16_t *run_codes;
     const uint8_t *run_bits, *run;
+    int bit_rates[5]; ///< Helpher to choose variants, rounded to nearest 5Mb/s
 } CIDEntry;
 
 extern const CIDEntry ff_dnxhd_cid_table[];
 
 int ff_dnxhd_get_cid_table(int cid);
+int ff_dnxhd_find_cid(AVCodecContext *avctx);
 
-#endif  // AVCODEC_DNXHDDATA_H
+#endif /* AVCODEC_DNXHDDATA_H */