projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
proxy bug fixes, add moveobj, sams icons, ladspa fixes, pot sigfpe
[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 5f3f93f18d784bce9c3b941d185cd3a3bd5fa93a..34bb736448ddc4384990abc6335857ece16e0d37 100644
(file)
--- a/
cinelerra-5.1/cinelerra/ffmpeg.h
+++ b/
cinelerra-5.1/cinelerra/ffmpeg.h
@@
-80,9
+80,9
@@
public:
virtual int encode_activate();
virtual int decode_activate();
virtual int encode_activate();
virtual int decode_activate();
+ virtual int write_packet(FFPacket &pkt);
int read_packet();
int seek(int64_t no, double rate);
int read_packet();
int seek(int64_t no, double rate);
- int write_packet(FFPacket &pkt);
int flush();
int decode(AVFrame *frame);
void load_markers(IndexMarks &marks, double rate);
int flush();
int decode(AVFrame *frame);
void load_markers(IndexMarks &marks, double rate);
@@
-145,6
+145,7
@@
class FFAudioStream : public FFStream {
int write(const float *fp, long len);
int zero(long len);
int write(const double *dp, long len, int ch);
int write(const float *fp, long len);
int zero(long len);
int write(const double *dp, long len, int ch);
+ int write_packet(FFPacket &pkt);
public:
FFAudioStream(FFMPEG *ffmpeg, AVStream *strm, int idx, int fidx);
virtual ~FFAudioStream();
public:
FFAudioStream(FFMPEG *ffmpeg, AVStream *strm, int idx, int fidx);
virtual ~FFAudioStream();
@@
-205,6
+206,7
@@
public:
};
class FFVideoStream : public FFStream, public FFVideoConvert {
};
class FFVideoStream : public FFStream, public FFVideoConvert {
+ int write_packet(FFPacket &pkt);
public:
FFVideoStream(FFMPEG *ffmpeg, AVStream *strm, int idx, int fidx);
virtual ~FFVideoStream();
public:
FFVideoStream(FFMPEG *ffmpeg, AVStream *strm, int idx, int fidx);
virtual ~FFVideoStream();