avcodec/avcodec: Free frame_thread_encoder on avcodec_open2() error

[ffmpeg] / libavcodec / dolby_e.h

diff --git a/libavcodec/dolby_e.h b/libavcodec/dolby_e.h
index 0838a1d3ea588cefd0e2becf4007ced3fa7c5bfa..9f0c06572901be16d4745ed7f9726183fed75514 100644 (file)
--- a/libavcodec/dolby_e.h
+++ b/libavcodec/dolby_e.h
@@ -58,6 +58,8 @@ typedef struct DolbyEHeaderInfo {
      * @{
      */
     int         multi_prog_warned;
+
+    int         sample_rate;
     /** @} */
 } DolbyEHeaderInfo;
 
@@ -81,9 +83,12 @@ typedef struct DBEContext {
     uint8_t     buffer[1024 * 3 + AV_INPUT_BUFFER_PADDING_SIZE];
 } DBEContext;
 
-static const uint16_t sample_rate_tab[16] = {
-    0, 42965, 43008, 44800, 53706, 53760
-};
+/**
+ * Use the provided key to transform the input into data (put into s->buffer)
+ * suitable for further processing and initialize s->gb to read said data.
+ */
+int ff_dolby_e_convert_input(DBEContext *s, int nb_words, int key);
+
 /**
  * Initialize DBEContext and parse Dolby E metadata.
  * Set word_bits/word_bytes, input, input_size, key_present