dcraw reset, ffmpeg+filejpeg+filesndfile fixes, vdevicex11 rework, bcbitmap fix,...

[goodguy/history.git] / cinelerra-5.1 / cinelerra / ffmpeg.h

diff --git a/cinelerra-5.1/cinelerra/ffmpeg.h b/cinelerra-5.1/cinelerra/ffmpeg.h
index e70bcbfb266f404beba4ab9491d03a243d5c34f6..5f3f93f18d784bce9c3b941d185cd3a3bd5fa93a 100644 (file)
--- a/cinelerra-5.1/cinelerra/ffmpeg.h
+++ b/cinelerra-5.1/cinelerra/ffmpeg.h
@@ -150,6 +150,7 @@ public:
        virtual ~FFAudioStream();
        int is_audio() { return 1; }
        int is_video() { return 0; }
+       void init_swr(int ichs, int ifmt, int irate);
        int get_samples(float *&samples, uint8_t **data, int len);
        int load_history(uint8_t **data, int len);
        int decode_frame(AVFrame *frame);
@@ -168,6 +169,7 @@ public:
        int load(int64_t pos, int len);
        int audio_seek(int64_t pos);
        int encode(double **samples, int len);
+       int drain();
 
        int idx;
        int channel0, channels;
@@ -176,6 +178,7 @@ public:
        int64_t length;
 
        SwrContext *resample_context;
+       int swr_ichs, swr_ifmt, swr_irate;
        int aud_bfr_sz;
        float *aud_bfr;
 };
@@ -217,6 +220,7 @@ public:
        int load(VFrame *vframe, int64_t pos);
        int video_seek(int64_t pos);
        int encode(VFrame *vframe);
+       int drain();
 
        int idx;
        double frame_rate;