X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fffmpeg.h;fp=cinelerra-5.1%2Fcinelerra%2Fffmpeg.h;h=b4867b8eb1943879499d7a6ed33515d9533ff44f;hp=9bfd268adb7bd624f2473dfda6047ec467b44474;hb=f890683b11652fc31712acd0d7317a1b235a314e;hpb=1d4f5d708de0d8ec19300b417354a3374d00ed47 diff --git a/cinelerra-5.1/cinelerra/ffmpeg.h b/cinelerra-5.1/cinelerra/ffmpeg.h index 9bfd268a..b4867b8e 100644 --- a/cinelerra-5.1/cinelerra/ffmpeg.h +++ b/cinelerra-5.1/cinelerra/ffmpeg.h @@ -83,7 +83,7 @@ public: virtual int encode_activate(); virtual int decode_activate(); virtual AVHWDeviceType decode_hw_activate(); - virtual void decode_hw_format(AVCodec *decoder, AVHWDeviceType type); + virtual int decode_hw_format(AVCodec *decoder, AVHWDeviceType type); virtual int write_packet(FFPacket &pkt); int read_packet(); int seek(int64_t no, double rate); @@ -235,7 +235,7 @@ public: int is_video() { return 1; } int decode_frame(AVFrame *frame); AVHWDeviceType decode_hw_activate(); - void decode_hw_format(AVCodec *decoder, AVHWDeviceType type); + int decode_hw_format(AVCodec *decoder, AVHWDeviceType type); AVHWDeviceType encode_hw_activate(const char *hw_dev); int encode_hw_write(FFrame *picture); int encode_frame(AVFrame *frame);